X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fdialogs%2FError.java;h=b5b50b11450168b93226e18dad4855d23e8893d6;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=4e6716ecc41c56fae4d673d0c9117c3373e55ad6;hpb=7fe4a16dad045373bb014724733c1bbb175d44b5;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java
index 4e6716ecc..b5b50b114 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java
@@ -1,81 +1,29 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.eclipse.ui.dialogs;
 
-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;
-
-/** !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) {
-		new Error(Display.getDefault().getActiveShell(), message, e).open();
-	}
-
-	public static void show(String message) {
-		new Error(Display.getDefault().getActiveShell(), message, null).open();
-	}
 
+/**
+ * Generic error dialog to be used in try/catch blocks
+ * 
+ * @deprecated use {@link org.argeo.eclipse.ui.ErrorFeedback} instead.
+ */
+public class Error extends org.argeo.eclipse.ui.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);
+		super(parentShell, message, e);
 	}
-
-	@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");
-	}
-
 }