Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 96600 invoked from network); 21 Oct 2009 09:31:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Oct 2009 09:31:58 -0000 Received: (qmail 16001 invoked by uid 500); 21 Oct 2009 09:31:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 15936 invoked by uid 500); 21 Oct 2009 09:31:58 -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 15927 invoked by uid 99); 21 Oct 2009 09:31:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Oct 2009 09:31:58 +0000 X-ASF-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL,BAYES_00 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, 21 Oct 2009 09:31:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35F1B2388981; Wed, 21 Oct 2009 09:31:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r827939 - in /directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor: ./ dialogs/ model/ sourceeditor/ valueeditors/ Date: Wed, 21 Oct 2009 09:31:34 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091021093135.35F1B2388981@eris.apache.org> Author: pamarcelot Date: Wed Oct 21 09:31:33 2009 New Revision: 827939 URL: http://svn.apache.org/viewvc?rev=827939&view=rev Log: Code formatting. Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueWithContext.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIITemConstants.java Wed Oct 21 09:31:33 2009 @@ -20,7 +20,6 @@ package org.apache.directory.studio.aciitemeditor; - /** * This interface is used to store all constants related to the ACI Item Editor Plugin * @@ -31,7 +30,7 @@ { /** The plug-in ID */ public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); - + /** The ID for ACI Item Template */ public static final String ACI_ITEM_TEMPLATE_ID = Activator.getDefault().getPluginProperties().getString( "CtxType_AciItem_Template_id" );; //$NON-NLS-1$ Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueEditor.java Wed Oct 21 09:31:33 2009 @@ -59,8 +59,8 @@ Object value = getValue(); if ( value != null && value instanceof ACIItemValueWithContext ) { - ACIItemValueWithContext context = (ACIItemValueWithContext)value; - + ACIItemValueWithContext context = ( ACIItemValueWithContext ) value; + ACIItemDialog dialog = new ACIItemDialog( shell, context ); if ( dialog.open() == ACIItemDialog.OK && !"".equals( dialog.getACIItemValue() ) ) //$NON-NLS-1$ { @@ -71,7 +71,7 @@ return false; } - + /** * Returns a ACIItemValueContext with the connection * and entry of the attribute hierarchy and an empty value if there @@ -126,7 +126,7 @@ { IEntry entry = value.getAttribute().getEntry(); IBrowserConnection connection = entry.getBrowserConnection(); - String v = (String) o; + String v = ( String ) o; return new ACIItemValueWithContext( connection, entry, v ); } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueWithContext.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueWithContext.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueWithContext.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ACIItemValueWithContext.java Wed Oct 21 09:31:33 2009 @@ -86,8 +86,8 @@ { return entry; } - - + + /** * {@inheritDoc} */ Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/Activator.java Wed Oct 21 09:31:33 2009 @@ -286,10 +286,9 @@ { // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed, // So we're using a default plugin id. - getLog() - .log( - new Status( Status.ERROR, "org.apache.directory.studio.aciitemeditor", Status.OK, - "Unable to get the plugin properties.", e ) ); + getLog().log( + new Status( Status.ERROR, "org.apache.directory.studio.aciitemeditor", Status.OK, + "Unable to get the plugin properties.", e ) ); } } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/MultiValuedDialog.java Wed Oct 21 09:31:33 2009 @@ -124,8 +124,8 @@ protected void configureShell( Shell shell ) { super.configureShell( shell ); - shell.setText( Messages.getString("MultiValuedDialog.dialog.titlePrefix") + displayName ); //$NON-NLS-1$ - shell.setImage( Activator.getDefault().getImage( Messages.getString("MultiValuedDialog.dialog.icon") ) ); //$NON-NLS-1$ + shell.setText( Messages.getString( "MultiValuedDialog.dialog.titlePrefix" ) + displayName ); //$NON-NLS-1$ + shell.setImage( Activator.getDefault().getImage( Messages.getString( "MultiValuedDialog.dialog.icon" ) ) ); //$NON-NLS-1$ } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/dialogs/UserPermissionDialog.java Wed Oct 21 09:31:33 2009 @@ -55,7 +55,7 @@ /** The context */ private ACIItemValueWithContext context; - + /** The initial value, passed by the constructor */ private UserPermission initialUserPermission; @@ -82,7 +82,8 @@ * @param initialUserPermission the initial user permission * @param context the context */ - public UserPermissionDialog( Shell parentShell, UserPermission initialUserPermission, ACIItemValueWithContext context ) + public UserPermissionDialog( Shell parentShell, UserPermission initialUserPermission, + ACIItemValueWithContext context ) { super( parentShell ); super.setShellStyle( super.getShellStyle() | SWT.RESIZE ); @@ -100,8 +101,8 @@ protected void configureShell( Shell shell ) { super.configureShell( shell ); - shell.setText( Messages.getString("UserPermissionDialog.dialog.text") ); //$NON-NLS-1$ - shell.setImage( Activator.getDefault().getImage( Messages.getString("UserPermissionDialog.dialog.icon") ) ); //$NON-NLS-1$ + shell.setText( Messages.getString( "UserPermissionDialog.dialog.text" ) ); //$NON-NLS-1$ + shell.setImage( Activator.getDefault().getImage( Messages.getString( "UserPermissionDialog.dialog.icon" ) ) ); //$NON-NLS-1$ } @@ -120,7 +121,8 @@ } catch ( Exception e ) { - MessageDialog.openError( getShell(), Messages.getString("UserPermissionDialog.error.invalidUserPermission"), e.getMessage() ); //$NON-NLS-1$ + MessageDialog.openError( getShell(), Messages + .getString( "UserPermissionDialog.error.invalidUserPermission" ), e.getMessage() ); //$NON-NLS-1$ } } @@ -141,7 +143,7 @@ spinnerComposite.setLayout( new GridLayout( 2, false ) ); spinnerComposite.setLayoutData( new GridData() ); precedenceCheckbox = new Button( spinnerComposite, SWT.CHECK ); - precedenceCheckbox.setText( Messages.getString("UserPermissionDialog.precedence.label") ); //$NON-NLS-1$ + precedenceCheckbox.setText( Messages.getString( "UserPermissionDialog.precedence.label" ) ); //$NON-NLS-1$ precedenceCheckbox.addSelectionListener( new SelectionAdapter() { public void widgetSelected( SelectionEvent e ) @@ -198,5 +200,5 @@ { return returnUserPermission; } - + } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/Messages.java Wed Oct 21 09:31:33 2009 @@ -24,7 +24,7 @@ import java.util.ResourceBundle; -public class Messages +public class Messages { private static final String BUNDLE_NAME = "org.apache.directory.studio.aciitemeditor.model.messages"; //$NON-NLS-1$ Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapper.java Wed Oct 21 09:31:33 2009 @@ -130,8 +130,8 @@ * @param valueSuffix the dislpay name * @param valueEditor the value editor */ - public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, String valueSuffix, - AbstractDialogStringValueEditor valueEditor ) + public ProtectedItemWrapper( Class clazz, boolean isMultivalued, String valuePrefix, + String valueSuffix, AbstractDialogStringValueEditor valueEditor ) { this.clazz = clazz; this.isMultivalued = isMultivalued; Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/ProtectedItemWrapperFactory.java Wed Oct 21 09:31:33 2009 @@ -49,7 +49,7 @@ { ProtectedItemWrapper[] protectedItemWrappers = new ProtectedItemWrapper[] { - // entry + // entry new ProtectedItemWrapper( ProtectedItem.Entry.class, false, "", //$NON-NLS-1$ "", //$NON-NLS-1$ null ), Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/model/UserClassWrapperFactory.java Wed Oct 21 09:31:33 2009 @@ -44,7 +44,7 @@ { UserClassWrapper[] userClassWrappers = new UserClassWrapper[] { - // allUsers + // allUsers new UserClassWrapper( UserClass.AllUsers.class, "", //$NON-NLS-1$ "", //$NON-NLS-1$ null ), @@ -72,8 +72,7 @@ // subtree new UserClassWrapper( UserClass.Subtree.class, "", //$NON-NLS-1$ "", //$NON-NLS-1$ - new SubtreeValueEditor( false, false ) - ) }; + new SubtreeValueEditor( false, false ) ) }; return userClassWrappers; } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACIFormattingStrategy.java Wed Oct 21 09:31:33 2009 @@ -19,10 +19,12 @@ */ package org.apache.directory.studio.aciitemeditor.sourceeditor; + import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants; import org.eclipse.jface.text.formatter.IFormattingStrategy; import org.eclipse.jface.text.source.ISourceViewer; + /** * This class implements the formatting strategy for the ACI Item Editor. *
    @@ -38,14 +40,14 @@ /** The Constant INDENT_STRING. */ public static final String INDENT_STRING = " "; //$NON-NLS-1$ - + /** The Constant NEWLINE. */ public static final String NEWLINE = BrowserCoreConstants.LINE_SEPARATOR; - + /** The source viewer. */ private ISourceViewer sourceViewer; - - + + /** * Creates a new instance of ACIFormattingStrategy. * @@ -63,9 +65,9 @@ public String format( String content, boolean isLineStart, String indentation, int[] positions ) { String oldContent = sourceViewer.getDocument().get(); - String newContent = internFormat ( oldContent ); + String newContent = internFormat( oldContent ); sourceViewer.getDocument().set( newContent ); - + return null; } @@ -85,39 +87,40 @@ { } + private String internFormat( String content ) { StringBuffer sb = new StringBuffer(); // flag to track if a new line was started boolean newLineStarted = true; - + // flag to track if we are within a quoted string boolean inQuotedString = false; - + // flag to track if the current expression is appended in one-line mode boolean oneLineMode = false; - + // the current indent int indent = 0; int contentLength = content.length(); - for (int i=0; i 1) + if ( commaCounter > 1 ) { return false; } } } - + return false; } - + } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/sourceeditor/ACISourceViewerConfiguration.java Wed Oct 21 09:31:33 2009 @@ -77,7 +77,8 @@ return assistant; } - + + /* (non-Javadoc) * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentFormatter(org.eclipse.jface.text.source.ISourceViewer) */ @@ -89,5 +90,5 @@ formatter.setFormattingStrategy( formattingStrategy, IDocument.DEFAULT_CONTENT_TYPE ); return formatter; } - + } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeAndValueValueEditor.java Wed Oct 21 09:31:33 2009 @@ -72,8 +72,8 @@ */ public Object getRawValue( IValue value ) { - return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value.getStringValue() ) - : null; + return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value + .getStringValue() ) : null; } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/AttributeTypeValueEditor.java Wed Oct 21 09:31:33 2009 @@ -70,8 +70,8 @@ */ public Object getRawValue( IValue value ) { - return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value.getStringValue() ) - : null; + return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value + .getStringValue() ) : null; } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/FilterValueEditor.java Wed Oct 21 09:31:33 2009 @@ -72,8 +72,8 @@ */ public Object getRawValue( IValue value ) { - return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value.getStringValue() ) - : null; + return value != null ? getRawValue( value.getAttribute().getEntry().getBrowserConnection(), value + .getStringValue() ) : null; } Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeSpecificationDialog.java Wed Oct 21 09:31:33 2009 @@ -19,6 +19,7 @@ */ package org.apache.directory.studio.aciitemeditor.valueeditors; + import java.text.ParseException; import java.util.ArrayList; import java.util.Iterator; @@ -63,6 +64,7 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.Text; + /** * This class provides a dialog to enter the Subtree Specification value. * @@ -509,7 +511,7 @@ subtreeSpecification = null; valid &= false; } - + if ( refinementOrFilterVisible && filterButton.getSelection() ) { valid &= filterWidget.getFilter() != null; @@ -659,7 +661,8 @@ } ExclusionDialog dialog = new ExclusionDialog( getShell(), connection, chopBase, "" ); //$NON-NLS-1$ - if ( dialog.open() == TextDialog.OK && !SubtreeValueEditor.EMPTY.equals( dialog.getType() ) && !SubtreeValueEditor.EMPTY.equals( dialog.getDN() ) ) + if ( dialog.open() == TextDialog.OK && !SubtreeValueEditor.EMPTY.equals( dialog.getType() ) + && !SubtreeValueEditor.EMPTY.equals( dialog.getDN() ) ) { String newValue = dialog.getType() + ": \"" + dialog.getDN() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ exclusions.add( newValue ); Modified: directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java?rev=827939&r1=827938&r2=827939&view=diff ============================================================================== --- directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java (original) +++ directory/studio/trunk/aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/SubtreeValueEditor.java Wed Oct 21 09:31:33 2009 @@ -20,7 +20,6 @@ package org.apache.directory.studio.aciitemeditor.valueeditors; - import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.studio.ldapbrowser.common.dialogs.TextDialog; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; @@ -41,7 +40,7 @@ static final String EMPTY = ""; //$NON-NLS-1$ private boolean refinementOrFilterVisible; - + private boolean useLocalName; @@ -106,7 +105,6 @@ return null; } - /** * The SubtreeSpecificationValueWrapper is used to pass contextual * information to the opened SubtreeSpecificationDialog. @@ -136,7 +134,8 @@ * @param subtreeSpecification * the subtreeSpecification */ - private SubtreeSpecificationValueWrapper( IBrowserConnection connection, LdapDN subentryDN, String subtreeSpecification ) + private SubtreeSpecificationValueWrapper( IBrowserConnection connection, LdapDN subentryDN, + String subtreeSpecification ) { this.connection = connection; this.subentryDN = subentryDN;