Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2BD07921 for ; Wed, 7 Dec 2011 18:47:18 +0000 (UTC) Received: (qmail 96106 invoked by uid 500); 7 Dec 2011 18:47:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 96072 invoked by uid 500); 7 Dec 2011 18:47:18 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 96065 invoked by uid 99); 7 Dec 2011 18:47:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 18:47:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Dec 2011 18:47:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DAE7F23889C5 for ; Wed, 7 Dec 2011 18:46:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1211588 - /directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java Date: Wed, 07 Dec 2011 18:46:53 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111207184653.DAE7F23889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Dec 7 18:46:53 2011 New Revision: 1211588 URL: http://svn.apache.org/viewvc?rev=1211588&view=rev Log: Fix for DIRSTUDIO-655 (Switch usage of SWT MessageBox to JFace MessageDialog for info, warning and error dialogs). Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java?rev=1211588&r1=1211587&r2=1211588&view=diff ============================================================================== --- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java (original) +++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/ServerConfigurationEditor.java Wed Dec 7 18:46:53 2011 @@ -58,7 +58,6 @@ import org.eclipse.jface.operation.IRunn import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.MessageBox; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; @@ -468,12 +467,11 @@ public class ServerConfigurationEditor e } catch ( Exception e ) { - MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - SWT.OK | SWT.ICON_ERROR ); - messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$ - messageBox - .setMessage( Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" + e.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$ - messageBox.open(); + MessageDialog.openError( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$ + Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$ + + e.getMessage() ); setDirty( true ); monitor.done(); return; @@ -608,13 +606,11 @@ public class ServerConfigurationEditor e } catch ( Exception e ) { - MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow() - .getShell(), SWT.OK | SWT.ICON_ERROR ); - messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$ - messageBox.setMessage( Messages - .getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$ - + e.getMessage() ); - messageBox.open(); + MessageDialog.openError( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$ + Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) //$NON-NLS-1$ + + "\n" + e.getMessage() ); //$NON-NLS-1$ setDirty( true ); monitor.done(); return; @@ -624,12 +620,12 @@ public class ServerConfigurationEditor e } catch ( Exception e ) { - MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), - SWT.OK | SWT.ICON_ERROR ); - messageBox.setText( Messages.getString( "ServerConfigurationEditor.Error" ) ); //$NON-NLS-1$ - messageBox - .setMessage( Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" + e.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$ - messageBox.open(); + MessageDialog + .openError( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + Messages.getString( "ServerConfigurationEditor.Error" ), //$NON-NLS-1$ + Messages.getString( "ServerConfigurationEditor.AnErrorOccurredWhenWritingTheFileToDisk" ) + "\n" //$NON-NLS-1$ //$NON-NLS-2$ + + e.getMessage() ); return; } }