WebSVN - OpenConcerto - Diff - Rev 144 and 156 - /trunk/OpenConcerto/src/org/openconcerto/utils/ExceptionHandler.java

 import java.awt.Component;
 import java.awt.Desktop;
 import java.awt.Desktop.Action;
 import java.awt.Dialog;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.Frame;
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import javax.swing.AbstractAction;
 import javax.swing.JSeparator;
 import javax.swing.JTextArea;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
-import javax.swing.text.JTextComponent;
 /**
  * Allow to display an exception both on the GUI and on the console.
+ *
  * @author ILM Informatique 7 mai 2004
     private static final String ILM_CONTACT = "http://www.ilm-informatique.fr/contact";
     private static String forumURL = null;
     private static boolean showProbably = false;
     private static IFactory<String> softwareInfos = null;
     private static ThrowableHandler tHandler = null;
+    private static boolean safeToExit = false;
+    private static final CompletableFuture<Boolean> FALSE_FUTURE = CompletableFuture.completedFuture(Boolean.FALSE);
+    private static final CompletableFuture<Boolean> TRUE_FUTURE = CompletableFuture.completedFuture(Boolean.TRUE);
     public static void setThrowableHandler(ThrowableHandler handler) {
         tHandler = handler;
+    }
     public static void setForumURL(String url) {
         forumURL = url;
+    }
+    public static void setSafeToExit(boolean b) {
+        safeToExit = b;
+    }
+    public static void setSubmitErrorAutoEnabled(boolean b) {
+        submitErrorAuto = b;
+    }
-    public synchronized static void setShowProbably(boolean showProbably) {
+    public static synchronized void setShowProbably(boolean showProbably) {
         ExceptionHandler.showProbably = showProbably;
+    }
-    public synchronized static boolean isShowProbably() {
+    public static synchronized boolean isShowProbably() {
         return ExceptionHandler.showProbably;
+    }
     public synchronized static void setSoftwareInformations(final IFactory<String> f) {
         softwareInfos = f;
      * Display the passed message. Note: this method doesn't block.
+     *
      * @param comp the modal parent of the error window.
      * @param msg the message to display.
      * @param originalExn the cause, can be <code>null</code>.
+     * @return a future completed when the error is handled (e.g. the user clicked on the dialog),
-     * @return an exception.
+     *         <code>false</code> if the error couldn't be displayed to the user.
      */
-    static public ExceptionHandler handle(Component comp, String msg, Throwable originalExn) {
+    static public Future<Boolean> handle(Component comp, String msg, Throwable originalExn) {
+        final Future<Boolean> res;
         if (tHandler != null && tHandler.handle(msg, originalExn)) {
+            res = TRUE_FUTURE;
+        } else {
-            return new ExceptionHandler(msg, originalExn);
+            res = new ExceptionHandler(comp, msg, originalExn, false).display();
+        }
-        return new ExceptionHandler(comp, msg, originalExn, false);
+        assert res != null;
+        return res;
+    }
-    static public RuntimeException handle(String msg, Throwable originalExn) {
+    static public Future<Boolean> handle(String msg, Throwable originalExn) {
         return handle(null, msg, originalExn);
+    }
-    static public RuntimeException handle(String msg) {
+    static public Future<Boolean> handle(String msg) {
         return handle(msg, null);
+    }
     /**
      * Display the passed message and quit. Note: this method blocks until the user closes the
      * @param msg the message to display.
      * @param originalExn the cause, can be <code>null</code>.
      * @return an exception.
      */
     static public RuntimeException die(String msg, Throwable originalExn) {
-        return new ExceptionHandler(null, msg, originalExn);
+        final ExceptionHandler res = new ExceptionHandler(null, msg, originalExn);
+        res.display();
+        return res;
+    }
     static public RuntimeException die(String msg) {
         return die(msg, null);
+    }
         return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+    }
     // the comp on which to display the popup, may be null
     private final Component comp;
-    private final Future<?> future;
+    private final boolean quit;
+    protected static AtomicInteger openedWindows = new AtomicInteger(0);
     private static boolean forceUI;
+    private static boolean submitErrorAuto = false;
     public static void setForceUI(boolean forceUI) {
         ExceptionHandler.forceUI = forceUI;
+    }
-    private Future<?> display(final boolean error) {
+    private Future<Boolean> display() {
+        final boolean error = this.quit;
         final String msg = this.getMessage();
         // write out the message as soon as possible
         getLogger().log(error ? Level.SEVERE : Level.INFO, null, this);
         // then show it to the user
         if (!GraphicsEnvironment.isHeadless() || forceUI) {
+            if (openedWindows.get() > 3) {
+                return FALSE_FUTURE;
+            }
+            final FutureTask<Boolean> run = new FutureTask<>(() -> {
+                return showMsgHardened(msg, error);
+            });
             if (SwingUtilities.isEventDispatchThread()) {
-                showMsgHardened(msg, error);
+                run.run();
             } else {
-                final FutureTask<?> run = new FutureTask<Object>(new Runnable() {
-                    public void run() {
-                        showMsgHardened(msg, error);
-                    }
-                }, null);
                 if (error) {
                     try {
                         SwingUtilities.invokeAndWait(run);
                     } catch (Exception e) {
                         e.printStackTrace();
                         System.exit(1);
+                    }
                 } else {
                     SwingUtilities.invokeLater(run);
+                }
-                return run;
-            }
+            }
-        return null;
+            return run;
+        }
-    public final Future<?> getDialogFuture() {
-        return this.future;
+        return TRUE_FUTURE;
+    }
-    protected final void showMsgHardened(final String msg, final boolean error) {
+    protected final Boolean showMsgHardened(final String msg, final boolean error) {
         try {
             showMsg(msg, error);
+            return Boolean.TRUE;
         } catch (Throwable e) {
             // sometimes the VM cannot display the dialog, in that case don't crash the EDT as the
             // message has already been logged. Further if this class is used in
             // Thread.setDefaultUncaughtExceptionHandler(), it will create an infinite loop.
             e = new Exception("Couldn't display message", e);
                 JOptionPane.showMessageDialog(null, e.getMessage() + " : " + msg);
             } catch (Throwable e2) {
                 // nothing
+            }
+        }
+        return Boolean.FALSE;
+    }
     protected final void showMsg(final String msg, final boolean quit) {
         final JPanel p = new JPanel();
         p.setLayout(new GridBagLayout());
             public void actionPerformed(ActionEvent e) {
                 copyToClipboard(textArea.getText());
+            }
         }));
-        final javax.swing.Action submitAction = new AbstractAction("Soumettre l'erreur") {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                submitError(p, textArea);
-            }
-            private void submitError(final JPanel p, final JTextComponent textArea) {
-                final Charset cs = StringUtils.UTF8;
-                try {
-                    ProductInfo productInfo = ProductInfo.getInstance();
-                    String name = "", version = "";
-                    if (productInfo != null) {
-                        name = productInfo.getName();
-                        version = productInfo.getProperty(ProductInfo.VERSION, version);
-                    }
-                    final Map<Info, String> systemInfos = SystemInfo.get(false);
-                    final String os = systemInfos.remove(Info.OS);
-                    final String java = systemInfos.toString();
-                    final String encodedData = "java=" + PercentEncoder.encode(java, cs) + "&os=" + PercentEncoder.encode(os, cs) + "&software=" + PercentEncoder.encode(name + version, cs) + "&stack="
-                            + PercentEncoder.encode(computeSoftwareInformations() + "\n\n" + textArea.getText(), cs);
-                    final String request = "http://bugreport.ilm-informatique.fr:5000/bugreport";
-                    final URL url = new URL(request);
-                    final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-                    connection.setDoOutput(true);
-                    connection.setRequestMethod("POST");
-                    connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
-                    connection.setRequestProperty("charset", cs.name());
-                    final byte[] bytes = encodedData.getBytes(cs);
-                    connection.setRequestProperty("Content-Length", String.valueOf(bytes.length));
-                    final OutputStream outputStream = connection.getOutputStream();
-                    outputStream.write(bytes);
-                    outputStream.flush();
-                    // Get the response
-                    final StringBuilder answer = new StringBuilder();
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-                    String line;
-                    while ((line = reader.readLine()) != null) {
-                        answer.append(line);
-                    }
-                    outputStream.close();
-                    reader.close();
-                    connection.disconnect();
-                    JOptionPane.showMessageDialog(p, "Merci d'avoir envoyé le rapport d'erreur au service technique.\nIl sera analysé prochainement.");
-                } catch (Exception ex) {
-                    ex.printStackTrace();
-                }
-            }
-        };
-        btnPanel.add(new JButton(submitAction));
         c.fill = GridBagConstraints.NONE;
         c.anchor = GridBagConstraints.EAST;
         p.add(btnPanel, c);
         c.gridy++;
             message = msg;
         } else {
             message = msg + "\n\n" + message;
+        }
         message += "\n";
-        message +=
+        message += getTrace();
+        if (submitErrorAuto) {
-                getTrace();
+            submitError(message);
+        }
         textArea.setText(message);
         textArea.setEditable(false);
         // Scroll
         JScrollPane scroll = new JScrollPane(textArea);
         c.gridy++;
         c.fill = GridBagConstraints.NONE;
         c.weighty = 0;
         c.insets = new Insets(2, 4, 2, 4);
+        JPanel closePanel = new JPanel();
+        closePanel.setLayout(new FlowLayout());
+        if (safeToExit) {
+            closePanel.add(new JButton(new AbstractAction("Quitter") {
+                @Override
+                public void actionPerformed(ActionEvent e) {
+                    System.exit(2);
+                }
+            }));
+        }
         final JButton buttonClose = new JButton("Fermer");
+        closePanel.add(buttonClose);
-        p.add(buttonClose, c);
+        p.add(closePanel, c);
         final Window window = this.comp == null ? null : SwingUtilities.getWindowAncestor(this.comp);
         final JDialog f;
         if (window instanceof Frame) {
             f = new JDialog((Frame) window, "Erreur", true);
         } else {
             f = new JDialog((Dialog) window, "Erreur", true);
+        }
         f.setContentPane(p);
         f.pack();
-        f.setSize(580, 680);
+        f.setSize(780, 580);
         f.setMinimumSize(new Dimension(380, 380));
         f.setLocationRelativeTo(this.comp);
         final ActionListener al = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                openedWindows.decrementAndGet();
                 if (quit) {
                     System.exit(1);
                 } else {
                     f.dispose();
+                }
+            }
         };
         buttonClose.addActionListener(al);
         // cannot set EXIT_ON_CLOSE on JDialog
         f.addWindowListener(new WindowAdapter() {
             @Override
             public void windowClosing(WindowEvent e) {
                 al.actionPerformed(null);
+            }
         });
+        openedWindows.incrementAndGet();
         f.setVisible(true);
+    }
     private String getTrace() {
         return ExceptionUtils.getStackTrace(this);
+    }
      * @param quit if the VM must exit.
      */
     private ExceptionHandler(Component comp, String msg, Throwable cause, boolean quit) {
         super(msg, cause);
         this.comp = comp;
-        this.future = this.display(quit);
+        this.quit = quit;
+    }
-    public ExceptionHandler(String msg, Throwable cause) {
+    private void submitError(String error) {
+        final Charset cs = StringUtils.UTF8;
+        try {
+            ProductInfo productInfo = ProductInfo.getInstance();
+            String name = "", version = "";
+            if (productInfo != null) {
+                name = productInfo.getName();
+                version = productInfo.getProperty(ProductInfo.VERSION, version);
+            }
+            final Map<Info, String> systemInfos = SystemInfo.get(false);
+            final String os = systemInfos.remove(Info.OS);
+            final String java = systemInfos.toString();
+            final String encodedData = "java=" + PercentEncoder.encode(java, cs) + "&os=" + PercentEncoder.encode(os, cs) + "&software=" + PercentEncoder.encode(name + version, cs) + "&stack="
+                    + PercentEncoder.encode(computeSoftwareInformations() + "\n\n" + error, cs);
+            Thread t = new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    final String request = "http://bugreport.ilm-informatique.fr:5000/bugreport";
-        super(msg, cause);
+                    try {
+                        System.err.println("ExceptionHandler.submitError");
+                        final URL url = new URL(request);
+                        final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                        connection.setDoOutput(true);
+                        connection.setRequestMethod("POST");
+                        connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+                        connection.setRequestProperty("charset", cs.name());
+                        final byte[] bytes = encodedData.getBytes(cs);
+                        connection.setRequestProperty("Content-Length", String.valueOf(bytes.length));
+                        final OutputStream outputStream = connection.getOutputStream();
+                        outputStream.write(bytes);
+                        outputStream.flush();
+                        // Get the response
+                        final StringBuilder answer = new StringBuilder();
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                        String line;
+                        while ((line = reader.readLine()) != null) {
+                            answer.append(line);
-        this.comp = null;
+                        }
+                        outputStream.close();
+                        reader.close();
+                        connection.disconnect();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
-        this.future = null;
+            t.start();
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
     public static void main(String[] args) throws Exception {
         UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
         ExceptionHandler.handle("Fichier de configuration corrompu\n\nmulti\nline", new IllegalStateException("Id manquant"));
+    }
+}

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/utils/ExceptionHandler.java - Rev 144 → 156