From commits-return-22262-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Wed Jul 22 17:48:07 2009 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 63070 invoked from network); 22 Jul 2009 17:48:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 22 Jul 2009 17:48:07 -0000 Received: (qmail 32668 invoked by uid 500); 22 Jul 2009 17:49:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 32605 invoked by uid 500); 22 Jul 2009 17:49:12 -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 32596 invoked by uid 99); 22 Jul 2009 17:49:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Jul 2009 17:49:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 22 Jul 2009 17:49:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 394D8238888F; Wed, 22 Jul 2009 17:48:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r796811 - in /directory/studio/trunk: connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/ valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/ Date: Wed, 22 Jul 2009 17:48:49 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090722174850.394D8238888F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Jul 22 17:48:49 2009 New Revision: 796811 URL: http://svn.apache.org/viewvc?rev=796811&view=rev Log: Fix for DIRSTUDIO-504 (Timestamp attribute with an invalid time in it is read only - editor ignores entry). Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/messages_fr.properties directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages.properties directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_de.properties directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_fr.properties Modified: directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/messages_fr.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/messages_fr.properties?rev=796811&r1=796810&r2=796811&view=diff ============================================================================== --- directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/messages_fr.properties (original) +++ directory/studio/trunk/connection-ui/src/main/java/org/apache/directory/studio/connection/ui/dialogs/messages_fr.properties Wed Jul 22 17:48:49 2009 @@ -24,7 +24,7 @@ CertificateTrustDialog.CertificateNotYetValid=- Le certificat n'est pas encore valide CertificateTrustDialog.CertificateExpired=- Le certificat a expir\u00E9 CertificateTrustDialog.SelfSignedCertificate=- Le certificat est auto-sign\u00E9 -CertificateTrustDialog.HostnameVerificationFailed=- Le nom d'hôte du server ne correspond pas au nom d'hôte du certificat +CertificateTrustDialog.HostnameVerificationFailed=- Le nom d'h\u00F4te du server ne correspond pas au nom d'h\u00F4te du certificat CertificateTrustDialog.ChooseTrustLevel=Veuillez examiner le certificat et choisissez si vous souhaitez lui faire confiance: CertificateTrustDialog.ViewCertificate=Afficher le certificat... CertificateTrustDialog.DoNotTrust=Ne pas faire confiance \u00E0 ce certificat. Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java?rev=796811&r1=796810&r2=796811&view=diff ============================================================================== --- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java (original) +++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/GeneralizedTimeValueEditor.java Wed Jul 22 17:48:49 2009 @@ -23,13 +23,17 @@ import java.text.DateFormat; import java.text.ParseException; +import java.util.Calendar; import java.util.Date; import org.apache.directory.shared.ldap.util.GeneralizedTime; import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog; import org.apache.directory.studio.ldapbrowser.core.model.IValue; import org.apache.directory.studio.valueeditors.AbstractDialogStringValueEditor; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.PlatformUI; /** @@ -83,22 +87,42 @@ if ( value != null && value instanceof String ) { String s = ( String ) value; + + // Trying to parse the value + GeneralizedTime generalizedTime = null; try { - GeneralizedTime generalizedTime = "".equals( s ) ? null : new GeneralizedTime( s ); //$NON-NLS-1$ - GeneralizedTimeValueDialog dialog = new GeneralizedTimeValueDialog( shell, generalizedTime ); - if ( dialog.open() == TextDialog.OK ) - { - setValue( dialog.getGeneralizedTime().toGeneralizedTime() ); - return true; - } + generalizedTime = "".equals( s ) ? null : new GeneralizedTime( s ); //$NON-NLS-1$ } catch ( ParseException pe ) { - return false; + // The value could not be parsed correctly + + // Displaying an error window indicating to the user that the value is bogus + // and asking him if he wants to continue to edit the value with current date and time selected + if ( MessageDialog.openConfirm( PlatformUI.getWorkbench().getDisplay().getActiveShell(), Messages + .getString( "GeneralizedTimeValueEditor.BogusDateAndTimeValue" ), NLS.bind( //$NON-NLS-1$ + Messages.getString( "GeneralizedTimeValueEditor.TheValueIsBogus" ), new String[] //$NON-NLS-1$ + { s } ) ) ) + { + // Generating today's date and time + generalizedTime = new GeneralizedTime( Calendar.getInstance() ); + } + else + { + return false; + } } + // Creating and opening the dialog + GeneralizedTimeValueDialog dialog = new GeneralizedTimeValueDialog( shell, generalizedTime ); + if ( dialog.open() == TextDialog.OK ) + { + setValue( dialog.getGeneralizedTime().toGeneralizedTime() ); + return true; + } } + return false; } } Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages.properties?rev=796811&r1=796810&r2=796811&view=diff ============================================================================== --- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages.properties (original) +++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages.properties Wed Jul 22 17:48:49 2009 @@ -20,3 +20,5 @@ GeneralizedTimeValueDialog.RawValue=Raw value: GeneralizedTimeValueDialog.Time=Time: GeneralizedTimeValueDialog.Timezone=Time zone: +GeneralizedTimeValueEditor.BogusDateAndTimeValue=Bogus Date & Time Value +GeneralizedTimeValueEditor.TheValueIsBogus=The value ''{0}'' is bogus and cannot be edited in the Date and Time Editor.\n\nWould you like to open the Date and Time Editor with today's date and time ?\n\n\nNote: To edit the bogus value, you can use the In-Place Text Editor. Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_de.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_de.properties?rev=796811&r1=796810&r2=796811&view=diff ============================================================================== --- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_de.properties (original) +++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_de.properties Wed Jul 22 17:48:49 2009 @@ -20,3 +20,5 @@ GeneralizedTimeValueDialog.RawValue=Unbearbeiteter Wert\: GeneralizedTimeValueDialog.Time=Zeit\: GeneralizedTimeValueDialog.Timezone=Zeitzone\: +GeneralizedTimeValueEditor.BogusDateAndTimeValue=TODO:Bogus Date & Time Value +GeneralizedTimeValueEditor.TheValueIsBogus=TODO:The value ''{0}'' is bogus and cannot be edited in the Date and Time Editor.\n\nWould you like to open the Date and Time Editor with today's date and time ?\n\n\nNote: To edit the bogus value, you can use the In-Place Text Editor. Modified: directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_fr.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_fr.properties?rev=796811&r1=796810&r2=796811&view=diff ============================================================================== --- directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_fr.properties (original) +++ directory/studio/trunk/valueeditors/src/main/java/org/apache/directory/studio/valueeditors/time/messages_fr.properties Wed Jul 22 17:48:49 2009 @@ -20,3 +20,5 @@ GeneralizedTimeValueDialog.RawValue=Valeur brute: GeneralizedTimeValueDialog.Time=Heure: GeneralizedTimeValueDialog.Timezone=Fuseau horaire: +GeneralizedTimeValueEditor.BogusDateAndTimeValue=Valeur de date et heure erron\u00E9e +GeneralizedTimeValueEditor.TheValueIsBogus=La valeur ''{0}'' est erron\u00E9e et ne peut pas \u00EAtre \u00E9dit\u00E9e dans l''\u00E9diteur de date et heure.\n\nVoulez-vous ouvrir l''\u00E9diteur de date et heure avec la date et l''heure d''aujourd''hui ?\n\n\nNote: Pour \u00E9diter la valeur erron\u00E9e, vous pouvez utiliser l''\u00E9diteur de texte en-place.