X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2FError.java;h=0022f17d2c62f45a95dd7404ddcf767d031bbc12;hb=c76283038c867fc0ef9eb6fa623040c58c6139bb;hp=04971d15545da6dd1393677df94da8597a3a2fc3;hpb=118878eb12c8e142da7648cae3880754b34798b2;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java
index 04971d155..0022f17d2 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java
@@ -1,100 +1,17 @@
 package org.argeo.eclipse.ui;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-/** Generic error dialog to be used in try/catch blocks */
-public class Error extends TitleAreaDialog {
-	private final static Log log = LogFactory.getLog(Error.class);
 
-	private final String message;
-	private final Throwable exception;
-
-	public static void show(String message, Throwable e) {
-		// rethrow ThreaDeath in order to make sure that RAP will properly clean
-		// up the UI thread
-		if (e instanceof ThreadDeath)
-			throw (ThreadDeath) e;
-		
-		new Error(getDisplay().getActiveShell(), message, e).open();
-	}
-
-	public static void show(String message) {
-		new Error(getDisplay().getActiveShell(), message, null).open();
-	}
-
-	/** Tries to find a display */
-	private static Display getDisplay() {
-		try {
-			Display display = PlatformUI.getWorkbench().getDisplay();
-			if (display != null)
-				return display;
-			else
-				return Display.getDefault();
-		} catch (Exception e) {
-			return Display.getCurrent();
-		}
-	}
+/**
+ * @deprecated deprecated because of poor naming, use {@link ErrorFeedback}
+ *             instead
+ */
+@Deprecated
+public class Error extends ErrorFeedback {
 
 	public Error(Shell parentShell, String message, Throwable e) {
-		super(parentShell);
-		this.message = message;
-		this.exception = e;
-		log.error(message, e);
-	}
-
-	protected Point getInitialSize() {
-		if (exception != null)
-			return new Point(800, 600);
-		else
-			return new Point(400, 300);
-	}
-
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogarea = (Composite) super.createDialogArea(parent);
-		dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		Composite composite = new Composite(dialogarea, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-		composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		setMessage(message != null ? message
-				+ (exception != null ? ": " + exception.getMessage() : "")
-				: exception != null ? exception.getMessage() : "Unkown Error",
-				IMessageProvider.ERROR);
-
-		if (exception != null) {
-			Text stack = new Text(composite, SWT.MULTI | SWT.LEAD | SWT.BORDER
-					| SWT.V_SCROLL | SWT.H_SCROLL);
-			stack.setEditable(false);
-			stack.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-			StringWriter sw = new StringWriter();
-			exception.printStackTrace(new PrintWriter(sw));
-			stack.setText(sw.toString());
-		}
-
-		parent.pack();
-		return composite;
-	}
-
-	protected void configureShell(Shell shell) {
-		super.configureShell(shell);
-		shell.setText("Error");
+		super(parentShell, message, e);
+		// TODO Auto-generated constructor stub
 	}
 
 }