directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1211589 - in /directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors: attributetype/ objectclass/
Date Wed, 07 Dec 2011 18:47:25 GMT
Author: pamarcelot
Date: Wed Dec  7 18:47:25 2011
New Revision: 1211589

URL: http://svn.apache.org/viewvc?rev=1211589&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/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
Wed Dec  7 18:47:25 2011
@@ -34,9 +34,8 @@ import org.apache.directory.studio.schem
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.IPageChangedListener;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
@@ -292,9 +291,7 @@ public class AttributeTypeEditor extends
      */
     private void notifyError( String message )
     {
-        MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.OK
-            | SWT.ICON_ERROR );
-        messageBox.setMessage( message );
-        messageBox.open();
+        MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+            Messages.getString( "AttributeTypeEditor.Error" ), message ); //$NON-NLS-1$ 
     }
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages.properties
Wed Dec  7 18:47:25 2011
@@ -20,6 +20,7 @@ ATESuperiorComboLabelProvider.None=(None
 ATESyntaxComboLabelProvider.None=(None)  -  ({0})
 AttributeTypeEditor.AttributeErrors=The editor of the Source Code contains errors, you cannot
save the attribute type until these errors are fixed.
 AttributeTypeEditor.CodeErrors=The editor of the Source Code contains errors, you cannot
return to the Overview page until these errors are fixed.
+AttributeTypeEditor.Error=Error\!
 AttributeTypeEditorInput.FromSchema={0} from the {1} schema 
 AttributeTypeEditorOverviewPage.Aliases=Aliases:
 AttributeTypeEditorOverviewPage.Collective=Collective

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_de.properties
Wed Dec  7 18:47:25 2011
@@ -20,6 +20,7 @@ ATESuperiorComboLabelProvider.None=(Kein
 ATESyntaxComboLabelProvider.None=(Keine)  -  ({0})
 AttributeTypeEditor.AttributeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie
k\u00F6nnen den Attribut Typ nicht speichern bis diese Fehler behoben sind.
 AttributeTypeEditor.CodeErrors=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne
solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
+AttributeTypeEditor.Error=Fehler\!
 AttributeTypeEditorInput.FromSchema={0} aus dem {1} Schema 
 AttributeTypeEditorOverviewPage.Aliases=Aliase\:
 AttributeTypeEditorOverviewPage.Collective=Gemeinsam

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/messages_fr.properties
Wed Dec  7 18:47:25 2011
@@ -20,6 +20,7 @@ ATESuperiorComboLabelProvider.None=(Pas 
 ATESyntaxComboLabelProvider.None=(Pas de nom)  -  ({0})
 AttributeTypeEditor.AttributeErrors=L'\u00E9diteur de code source contient des erreurs, vous
ne pouvez pas sauvegarder le type d'attribut tant que ces erreurs ne sont pas corrig\u00E9es.
 AttributeTypeEditor.CodeErrors=L'\u00E9diteur de code source contient des erreurs, vous ne
pouvez pas revenir \u00E0 la vue g\u00E9n\u00E9rale tant que ces erreurs ne sont pas corrig\u00E9es.
+AttributeTypeEditor.Error=Erreur \!
 AttributeTypeEditorInput.FromSchema={0} en provenance du sch\u00E9ma {1} 
 AttributeTypeEditorOverviewPage.Aliases=Alias:
 AttributeTypeEditorOverviewPage.Collective=Collectif

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
Wed Dec  7 18:47:25 2011
@@ -34,9 +34,8 @@ import org.apache.directory.studio.schem
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.IPageChangedListener;
+import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.PageChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.PartInitException;
@@ -288,9 +287,7 @@ public class ObjectClassEditor extends F
      */
     private void notifyError( String message )
     {
-        MessageBox messageBox = new MessageBox( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
SWT.OK
-            | SWT.ICON_ERROR );
-        messageBox.setMessage( message );
-        messageBox.open();
+        MessageDialog.openError( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
+            Messages.getString( "ObjectClassEditor.Error" ), message ); //$NON-NLS-1$ 
     }
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages.properties
Wed Dec  7 18:47:25 2011
@@ -17,6 +17,7 @@
 
 ObjectClassEditor.CodeError=The editor of the Source Code contains errors, you cannot return
to the Overview page until these errors are fixed.
 ObjectClassEditor.CodeErrorObject=The editor of the Source Code contains errors, you cannot
save the object class until these errors are fixed.
+ObjectClassEditor.Error=Error\!
 ObjectClassEditorAttributesTableLabelProvider.none=(None)  -  ({0})
 ObjectClassEditorInput.FromSchema={0} from the {1} schema 
 ObjectClassEditorOverviewPage.Abstract=Abstract

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_de.properties
Wed Dec  7 18:47:25 2011
@@ -17,6 +17,7 @@
 
 ObjectClassEditor.CodeError=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nne
solange nicht auf die \u00DCbersichtseite zur\u00FCckkehren, bis diese Fehler behoben sind.
 ObjectClassEditor.CodeErrorObject=Der Editor des Source Codes enth\u00E4lt Fehler, Sie k\u00F6nnen
den Objektklasse nicht speichern bis diese Fehler behoben sind.
+ObjectClassEditor.Error=Fehler\!
 ObjectClassEditorAttributesTableLabelProvider.none=(Keine)  -  ({0})
 ObjectClassEditorInput.FromSchema={0} aus dem {1} Schema 
 ObjectClassEditorOverviewPage.Abstract=Abstrakt

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties?rev=1211589&r1=1211588&r2=1211589&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/messages_fr.properties
Wed Dec  7 18:47:25 2011
@@ -17,6 +17,7 @@
 
 ObjectClassEditor.CodeError=L'\u00E9diteur de code source contient des erreurs, vous ne pouvez
pas revenir \u00E0 la vue d'ensemble tant que ces erreurs ne sont pas corrig\u00E9es.
 ObjectClassEditor.CodeErrorObject=L'\u00E9diteur de code source contient des erreurs, vous
ne pouvez pas sauvegarder la classe d'objet tant que ces erreurs ne sont pas corrig\u00E9es.
+ObjectClassEditor.Error=Erreur \!
 ObjectClassEditorAttributesTableLabelProvider.none=(Pas de nom)  -  ({0})
 ObjectClassEditorInput.FromSchema={0} en provenance du sch\u00E9ma {1} 
 ObjectClassEditorOverviewPage.Abstract=Abstrait



Mime
View raw message