WebSVN - OpenConcerto - Diff - Rev 177 and 182 - /trunk/OpenConcerto/src/org/openconcerto/utils/ExceptionHandler.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
         final Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
         final StringSelection data = new StringSelection(s);
         clipboard.setContents(data, data);
+    }
+    static public Future<Boolean> handle(Component comp, String msg, Throwable originalExn) {
+        return handle(comp, msg, null, originalExn);
+    }
     /**
      * 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 title the title, can be <code>null</code>.
      * @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),
      *         <code>false</code> if the error couldn't be displayed to the user.
      */
-    static public Future<Boolean> handle(Component comp, String msg, Throwable originalExn) {
+    static public Future<Boolean> handle(Component comp, String msg, String title, Throwable originalExn) {
         final Future<Boolean> res;
         if (tHandler != null && tHandler.handle(msg, originalExn)) {
             res = TRUE_FUTURE;
         } else {
-            res = new ExceptionHandler(comp, msg, originalExn, false).display();
+            res = new ExceptionHandler(comp, msg, title, originalExn, false).display();
+        }
         assert res != null;
         return res;
+    }
      * @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) {
-        final ExceptionHandler res = new ExceptionHandler(null, msg, originalExn);
+        final ExceptionHandler res = new ExceptionHandler(null, msg, null, originalExn);
         res.display();
         return res;
+    }
     static public RuntimeException die(String msg) {
         return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+    }
     // the comp on which to display the popup, may be null
     private final Component comp;
+    private final String title;
     private final boolean quit;
     protected static AtomicInteger openedWindows = new AtomicInteger(0);
     private static boolean forceUI;
     private static boolean submitErrorAuto = false;
+            }
+        }
         return Boolean.FALSE;
+    }
-    protected final void showMsg(final String msg, final boolean quit) {
+    protected final void showMsg(String msg, final boolean quit) {
+        if (msg == null) {
+            msg = "";
+        }
         final JPanel p = new JPanel();
         p.setLayout(new GridBagLayout());
         final GridBagConstraints c = new GridBagConstraints();
         c.insets = new Insets(10, 10, 10, 10);
         c.gridx = 0;
         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);
+            f = new JDialog((Frame) window, this.getTitle(), true);
         } else {
-            f = new JDialog((Dialog) window, "Erreur", true);
+            f = new JDialog((Dialog) window, this.getTitle(), true);
+        }
         f.setContentPane(p);
         f.pack();
         f.setSize(780, 580);
         f.setMinimumSize(new Dimension(380, 380));
     /**
      * Affiche l'erreur et quitte.
+     *
      * @param comp the component upon which to display the popup.
      * @param msg le message d'erreur à afficher.
+     * @param title the title, can be <code>null</code>.
      * @param cause la cause de l'exception (peut être <code>null</code>).
      */
-    private ExceptionHandler(Component comp, String msg, Throwable cause) {
+    private ExceptionHandler(Component comp, String msg, String title, Throwable cause) {
-        this(comp, msg, cause, true);
+        this(comp, msg, title, cause, true);
+    }
     /**
      * Affiche l'erreur et quitte suivant l'option passée.
+     *
      * @param comp the component upon which to display the popup.
      * @param msg the error message to display.
+     * @param title the title, can be <code>null</code>.
      * @param cause the cause of the exception (maybe <code>null</code>).
      * @param quit if the VM must exit.
      */
-    private ExceptionHandler(Component comp, String msg, Throwable cause, boolean quit) {
+    private ExceptionHandler(Component comp, String msg, String title, Throwable cause, boolean quit) {
         super(msg, cause);
         this.comp = comp;
+        this.title = title;
         this.quit = quit;
+    }
+    public String getTitle() {
+        if (this.title != null)
+            return this.title;
+        return this.quit ? "Erreur fatale" : "Erreur";
+    }
     private void submitError(String error) {
         final Charset cs = StringUtils.UTF8;
         try {
             ProductInfo productInfo = ProductInfo.getInstance();

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 177 → 182