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

Timestamp:

2008-08-12T18:28:04+02:00 (16 years ago)

Author:

stoecker

Message:

no longer shows relation membership header without relation

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• tools/BugReportExceptionHandler.java (modified) (6 diffs)

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

@@ -646 +646 @@
                         membershipData.addRow(new Object[]{e.getKey(), value});
                 }
+                membershipTable.getTableHeader().setVisible(membershipData.getRowCount() > 0);
         }
 }

trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -56 +56 @@
                         if (e instanceof PluginException)
                                 plugin = ((PluginException)e).plugin;
-                        
+
                         if (plugin == null)
                                 plugin = guessPlugin(e);
@@ -62 +62 @@
                         if (plugin != null) {
                                 int answer = JOptionPane.showConfirmDialog(
-                                                Main.parent, 
-                                                tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)+"\n"+
-                                                (plugin.info.author != null ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author) : "")+"\n"+
+                                                Main.parent, tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.",
+                                                plugin.info.name) + "\n"+ (plugin.info.author != null ?
+                                                tr("According to the information within the plugin, the author is {0}.",
+                                                plugin.info.author) : "") + "\n" +
                                                 tr("Should the plugin be disabled?"),
                                                 tr("Disable plugin"),
@@ -78 +79 @@
                                                         p = p.substring(1);
                                                 Main.pref.put("plugins", p);
-                                                JOptionPane.showMessageDialog(Main.parent, tr("The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."));
+                                                JOptionPane.showMessageDialog(Main.parent,
+                                                tr("The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."));
                                         } else {
-                                                JOptionPane.showMessageDialog(Main.parent, tr("The plugin could not be removed. Please tell the people you got JOSM from about the problem."));
+                                                JOptionPane.showMessageDialog(Main.parent,
+                                                tr("The plugin could not be removed. Please tell the people you got JOSM from about the problem."));
                                         }
                                         return;
@@ -88 +91 @@
                         Object[] options = new String[]{tr("Do nothing"), tr("Report Bug")};
                         int answer = JOptionPane.showOptionDialog(Main.parent, tr("An unexpected exception occurred.\n\n" +
-                                        "This is always a coding error. If you are running the latest\n" +
+                        "This is always a coding error. If you are running the latest\n" +
                         "version of JOSM, please consider being kind and file a bug report."),
                         tr("Unexpected Exception"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE,
@@ -121 +124 @@
 
                                         JPanel p = new JPanel(new GridBagLayout());
-                                        p.add(new JLabel(tr("Please report a ticket at http://josm.openstreetmap.de/newticket, including your steps to get to\n" +
-                                                                    "the error and be sure to include the following information")), GBC.eol());
+                                        p.add(new JLabel(tr("<html>Please report a ticket at {0}<br>" +
+                                        "Include your steps to get to the error (as detailed as possible)!<br>" +
+                                        "Be sure to include the following information:</html>", "http://josm.openstreetmap.de/newticket")), GBC.eol());
                                         try {
-                            Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(sb.toString()), new ClipboardOwner(){
-                                public void lostOwnership(Clipboard clipboard, Transferable contents) {}
-                            });
-                            p.add(new JLabel(tr("The text has already been copied to your clipboard.")), GBC.eop());
-                    } catch (RuntimeException x) {
-                    }
+                                                Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(sb.toString()), new ClipboardOwner(){
+                                                        public void lostOwnership(Clipboard clipboard, Transferable contents) {}
+                                                });
+                                                p.add(new JLabel(tr("The text has already been copied to your clipboard.")), GBC.eop());
+                                        }
+                                        catch (RuntimeException x) {}
 
                                         JTextArea info = new JTextArea(sb.toString(), 20, 60);
@@ -156 +160 @@
          * some known problem pattern has been found or <code>null</code>, if
          * the stack does not contain plugin-code.
-         * 
+         *
          * Note: This heuristic is not meant as discrimination against specific
          * plugins, but only to stop the flood of similar bug reports about plugins.
-         * Of course, plugin writers are free to install their own version of 
-         * an exception handler with their email address listed to receive 
-         * bug reports ;-). 
+         * Of course, plugin writers are free to install their own version of
+         * an exception handler with their email address listed to receive
+         * bug reports ;-).
          */
         private String guessPluginName(Throwable e) {
                 for (StackTraceElement element : e.getStackTrace()) {
                         String c = element.getClassName();
-                        
+
                         if (c.contains("wmsplugin.") || c.contains(".WMSLayer"))
                                 return "wmsplugin";