Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 72888 invoked from network); 26 Mar 2010 15:34:15 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Mar 2010 15:34:15 -0000 Received: (qmail 21289 invoked by uid 500); 26 Mar 2010 15:34:15 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 21235 invoked by uid 500); 26 Mar 2010 15:34:15 -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 21228 invoked by uid 99); 26 Mar 2010 15:34:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Mar 2010 15:34:15 +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; Fri, 26 Mar 2010 15:34:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E00DC23889FA; Fri, 26 Mar 2010 15:33:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r927916 - in /directory/studio/trunk: ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/ ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ ldapbrowser-common/s... Date: Fri, 26 Mar 2010 15:33:46 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100326153346.E00DC23889FA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Fri Mar 26 15:33:46 2010 New Revision: 927916 URL: http://svn.apache.org/viewvc?rev=927916&view=rev Log: Fix for DIRSTUDIO-638 (Improve the way we ask for operational attrbutes): o removed 'show operational attributes' option in entry editor menu o removed 'visible attributes' section in entry editor preference page Removed: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorFilter.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/ShowOperationalAttributesAction.java Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetUniversalListener.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonConstants.java Fri Mar 26 15:33:46 2010 @@ -84,10 +84,6 @@ public interface BrowserCommonConstants public static final String PREFERENCE_BROWSER_SEARCH_RESULT_LABEL = "browserSearchResultLabel"; //$NON-NLS-1$ public static final String PREFERENCE_BROWSER_SEARCH_RESULT_ABBREVIATE = "browserWearchResultAbbreviate"; //$NON-NLS-1$ public static final String PREFERENCE_BROWSER_SEARCH_RESULT_ABBREVIATE_MAX_LENGTH = "browserSearchResultAbbreviateMaxLength"; //$NON-NLS-1$ - public static final String PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES = "entryeditorShowMayAttributes"; //$NON-NLS-1$ - public static final String PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES = "entryeditorShowMustAttributes"; //$NON-NLS-1$ - public static final String PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES = "entryeditorShowObjectClassAttribute"; //$NON-NLS-1$ - public static final String PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES = "entryeditorShowOperationalAttributes"; //$NON-NLS-1$ public static final String PREFERENCE_ENTRYEDITOR_AUTOSAVE_SINGLE_TAB = "entryeditorAutoSaveSingleTab"; //$NON-NLS-1$ public static final String PREFERENCE_ENTRYEDITOR_AUTOSAVE_MULTI_TAB = "entryeditorAutoSaveMultiTab"; //$NON-NLS-1$ public static final String PREFERENCE_ENTRYEDITOR_ENABLE_FOLDING = "entryeditorEnableFolding"; //$NON-NLS-1$ Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/BrowserCommonPreferencesInitializer.java Fri Mar 26 15:33:46 2010 @@ -209,10 +209,6 @@ public class BrowserCommonPreferencesIni store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_ENABLE_FOLDING, true ); store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_FOLDING_THRESHOLD, 10 ); store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTO_EXPAND_FOLDED_ATTRIBUTES, false ); - store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES, true ); - store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES, true ); - store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES, true ); - store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, true ); store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTOSAVE_SINGLE_TAB, true ); store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTOSAVE_MULTI_TAB, false ); store.setDefault( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_OBJECTCLASS_AND_MUST_ATTRIBUTES_FIRST, true ); Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/EntryEditorPreferencePage.java Fri Mar 26 15:33:46 2010 @@ -29,7 +29,6 @@ import org.eclipse.swt.events.SelectionA import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; -import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -49,14 +48,6 @@ import org.eclipse.ui.IWorkbenchPreferen public class EntryEditorPreferencePage extends PreferencePage implements IWorkbenchPreferencePage { - private Button showObjectClassAttributeButton; - - private Button showMustAttributesButton; - - private Button showMayAttributesButton; - - private Button showOperationalAttributesButton; - private Button autosaveSingleTabButton; private Button autosaveMultiTabButton; @@ -98,34 +89,6 @@ public class EntryEditorPreferencePage e BaseWidgetUtils.createSpacer( composite, 1 ); BaseWidgetUtils.createSpacer( composite, 1 ); - Group visibleAttributesGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite, - 1, 1 ), Messages.getString( "EntryEditorPreferencePage.VisibleAttributes" ), 1 ); //$NON-NLS-1$ - Composite visibleAttributesComposite = BaseWidgetUtils.createColumnContainer( visibleAttributesGroup, 1, 1 ); - showObjectClassAttributeButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages - .getString( "EntryEditorPreferencePage.ShowObjectClassAttributes" ), 1 ); //$NON-NLS-1$ - showObjectClassAttributeButton.setSelection( getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES ) ); - showMustAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages - .getString( "EntryEditorPreferencePage.ShowMustAttributes" ), //$NON-NLS-1$ - 1 ); - showMustAttributesButton.setSelection( getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES ) ); - showMayAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages - .getString( "EntryEditorPreferencePage.ShowMayAttributes" ), 1 ); //$NON-NLS-1$ - showMayAttributesButton.setSelection( getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES ) ); - showOperationalAttributesButton = BaseWidgetUtils.createCheckbox( visibleAttributesComposite, Messages - .getString( "EntryEditorPreferencePage.ShowOperationalAttributes" ), 1 ); //$NON-NLS-1$ - showOperationalAttributesButton.setSelection( getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); - Label operationalAttributesLabel = BaseWidgetUtils.createWrappedLabel( visibleAttributesComposite, Messages - .getString( "EntryEditorPreferencePage.ShowOperationalAttributesToolTip" ), 1 ); - GridData gd = new GridData( GridData.FILL_HORIZONTAL ); - gd.widthHint = 300; - operationalAttributesLabel.setLayoutData( gd ); - - BaseWidgetUtils.createSpacer( composite, 1 ); - BaseWidgetUtils.createSpacer( composite, 1 ); String foldingTooltip = Messages.getString( "EntryEditorPreferencePage.FoldingToolTip" ); //$NON-NLS-1$ Group foldingGroup = BaseWidgetUtils.createGroup( BaseWidgetUtils.createColumnContainer( composite, 1, 1 ), Messages.getString( "EntryEditorPreferencePage.Folding" ), 1 ); //$NON-NLS-1$ @@ -207,15 +170,6 @@ public class EntryEditorPreferencePage e */ public boolean performOk() { - getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES, - showObjectClassAttributeButton.getSelection() ); - getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES, - showMustAttributesButton.getSelection() ); - getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES, - showMayAttributesButton.getSelection() ); - getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, - showOperationalAttributesButton.getSelection() ); - getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTOSAVE_SINGLE_TAB, autosaveSingleTabButton.getSelection() ); getPreferenceStore().setValue( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTOSAVE_MULTI_TAB, @@ -237,15 +191,6 @@ public class EntryEditorPreferencePage e */ protected void performDefaults() { - showObjectClassAttributeButton.setSelection( getPreferenceStore().getDefaultBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES ) ); - showMustAttributesButton.setSelection( getPreferenceStore().getDefaultBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES ) ); - showMayAttributesButton.setSelection( getPreferenceStore().getDefaultBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES ) ); - showOperationalAttributesButton.setSelection( getPreferenceStore().getDefaultBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); - autosaveSingleTabButton.setSelection( getPreferenceStore().getDefaultBoolean( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_AUTOSAVE_SINGLE_TAB ) ); autosaveMultiTabButton.setSelection( getPreferenceStore().getDefaultBoolean( Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages.properties Fri Mar 26 15:33:46 2010 @@ -67,12 +67,6 @@ EntryEditorPreferencePage.Folding=Attrib EntryEditorPreferencePage.FoldingThreshold=Folding threshold: EntryEditorPreferencePage.FoldingToolTip=If an attribute has more than the specified number of values it will be folded to one line. You may expand and collapse the values. EntryEditorPreferencePage.GeneralSettings=General settings for the LDAP entry editor: -EntryEditorPreferencePage.ShowMayAttributes=Show may attributes -EntryEditorPreferencePage.ShowMustAttributes=Show must attributes -EntryEditorPreferencePage.ShowObjectClassAttributes=Show objectClass attribute -EntryEditorPreferencePage.ShowOperationalAttributes=Show operational attributes -EntryEditorPreferencePage.ShowOperationalAttributesToolTip=Note: Operational attributes must be requested from the directory. You could define to request operational attributes for the whole connection in the "Connection properties". Another way is to request operational attributes for the selected entry only, choose "Fetch Operational Attributes" from the context menu. -EntryEditorPreferencePage.VisibleAttributes=Visible Attributes MainPreferencePage.GeneralSettings=General settings for the LDAP browser: MainPreferencePage.LDAP=LDAP SyntaxDialog.SelectSyntaxOID=Select Syntax OID Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_de.properties Fri Mar 26 15:33:46 2010 @@ -67,12 +67,6 @@ EntryEditorPreferencePage.Folding=Attrib EntryEditorPreferencePage.FoldingThreshold=Faltgrenze: EntryEditorPreferencePage.FoldingToolTip=Wenn ein Attribut mehr Werte als die angegebenen Grenze hat, wird es gefaltet dargestellt. Die Werte k\u00F6nnen auf- und zugeklappt werden. EntryEditorPreferencePage.GeneralSettings=Allgemeine Einstellungen f\u00FCr den Eintrags-Editor -EntryEditorPreferencePage.ShowMayAttributes=Optionale Attribute anzeigen -EntryEditorPreferencePage.ShowMustAttributes=Pflichattribute anzeigen -EntryEditorPreferencePage.ShowObjectClassAttributes=Objektklassen anzeigen -EntryEditorPreferencePage.ShowOperationalAttributes=Operationale Attribute anzeigen -EntryEditorPreferencePage.ShowOperationalAttributesToolTip=Hinweis: Operationale Attribute m\u00FCssen vom Server angefordert werden. Dies kann in den Verbindungseigenschaften f\u00FCr die gesamte Verbindung eingestellt werden. Die operationalen Attribute k\u00F6nnen auch für einzelne Eintr\u00E4ge angefordert werden, hierf\u00FCr "Operationale Attribute abrufen" im Kontextmen\u00FC ausw\u00E4hlen. -EntryEditorPreferencePage.VisibleAttributes=Sichtbare Attribute MainPreferencePage.GeneralSettings=Allgemeine Einstellungen f\u00FCr den LDAP Browser: MainPreferencePage.LDAP=LDAP SyntaxDialog.SelectSyntaxOID=Syntax OID ausw\u00E4hlen Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/messages_fr.properties Fri Mar 26 15:33:46 2010 @@ -67,12 +67,6 @@ EntryEditorPreferencePage.Folding=R\u00E EntryEditorPreferencePage.FoldingThreshold=Seuil de r\u00E9union: EntryEditorPreferencePage.FoldingToolTip=Si un attribut poss\u00E8de un nombre de valeurs sup\u00E9rieur au seuil sp\u00E9cifi\u00E9, il sera r\u00E9uni sur une seule ligne. Il est ensuite possible de d\u00E9plier et replier les valeurs.. EntryEditorPreferencePage.GeneralSettings=R\u00E9glages g\u00E9n\u00E9raux pour l'\u00E9diteur d'entr\u00E9e LDAP: -EntryEditorPreferencePage.ShowMayAttributes=Afficher les attributs facultatifs (MAY) -EntryEditorPreferencePage.ShowMustAttributes=Afficher les attributs obligatoires (MUST) -EntryEditorPreferencePage.ShowObjectClassAttributes=Afficher l'attribut objectClass -EntryEditorPreferencePage.ShowOperationalAttributes=Afficher les attributs op\u00E9rationnels -EntryEditorPreferencePage.ShowOperationalAttributesToolTip=Note: Les attributs op\u00E9rationnels doivent \u00EAtre demand\u00E9s aupr\u00E8s de l'annuaire. Il est possible de d\u00E9finir une demande des attributs op\u00E9rationnels pour l'ensemble d'une connexion dans la page de propri\u00E9t\u00E9s de la connexion. Il est \u00E9galement possible d'obtenir les attributs op\u00E9rationnels de l'entr\u00E9e s\u00E9lectionn\u00E9e uniquement en choisissant "R\u00E9cup\u00E9rer les attributs op\u00E9rationnels" dans le menu contextuel. -EntryEditorPreferencePage.VisibleAttributes=Attributs visibles MainPreferencePage.GeneralSettings=R\u00E9glages g\u00E9n\u00E9raux pour le navigateur LDAP: MainPreferencePage.LDAP=LDAP SyntaxDialog.SelectSyntaxOID=S\u00E9lectionner l'OID de la syntaxe Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetContentProvider.java Fri Mar 26 15:33:46 2010 @@ -24,14 +24,11 @@ package org.apache.directory.studio.ldap import java.util.ArrayList; import java.util.List; -import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; -import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesRunnable; import org.apache.directory.studio.ldapbrowser.core.jobs.StudioBrowserJob; import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy; import org.apache.directory.studio.ldapbrowser.core.model.IAttribute; import org.apache.directory.studio.ldapbrowser.core.model.IEntry; -import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE; import org.apache.directory.studio.ldapbrowser.core.model.IValue; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -127,9 +124,6 @@ public class EntryEditorWidgetContentPro */ public Object[] getElements( Object inputElement ) { - boolean showOperationalAttributes = BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ); - if ( inputElement != null && inputElement instanceof IEntry ) { IEntry entry = ( IEntry ) inputElement; @@ -144,7 +138,7 @@ public class EntryEditorWidgetContentPro else { IAttribute[] attributes = entry.getAttributes(); - Object[] values = getValues( attributes, showOperationalAttributes ); + Object[] values = getValues( attributes ); return values; } } @@ -152,7 +146,7 @@ public class EntryEditorWidgetContentPro { AttributeHierarchy ah = ( AttributeHierarchy ) inputElement; IAttribute[] attributes = ah.getAttributes(); - Object[] values = getValues( attributes, showOperationalAttributes ); + Object[] values = getValues( attributes ); return values; } else @@ -166,35 +160,30 @@ public class EntryEditorWidgetContentPro * Gets the values of the given attributes. * * @param attributes the attributes - * @param showOperationalAttributes true if operational attributes are visible * * @return the values */ - private Object[] getValues( IAttribute[] attributes, boolean showOperationalAttributes ) + private Object[] getValues( IAttribute[] attributes ) { List valueList = new ArrayList(); if ( attributes != null ) { for ( IAttribute attribute : attributes ) { - if ( !attribute.isOperationalAttribute() || showOperationalAttributes - || ( attribute.getEntry() instanceof IRootDSE ) ) + IValue[] values = attribute.getValues(); + if ( preferences == null || !preferences.isUseFolding() + || ( values.length <= preferences.getFoldingThreshold() ) ) { - IValue[] values = attribute.getValues(); - if ( preferences == null || !preferences.isUseFolding() - || ( values.length <= preferences.getFoldingThreshold() ) ) - { - for ( IValue value : values ) - { - valueList.add( value ); - } - } - else + for ( IValue value : values ) { - // if folding threshold is exceeded then return the attribute itself - valueList.add( attribute ); + valueList.add( value ); } } + else + { + // if folding threshold is exceeded then return the attribute itself + valueList.add( attribute ); + } } } return valueList.toArray(); Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetFilter.java Fri Mar 26 15:33:46 2010 @@ -23,7 +23,6 @@ package org.apache.directory.studio.ldap import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; import org.apache.directory.studio.ldapbrowser.core.model.IAttribute; -import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE; import org.apache.directory.studio.ldapbrowser.core.model.IValue; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; @@ -96,12 +95,6 @@ public class EntryEditorWidgetFilter ext { return false; } - - // check attribute category - if ( !goesThroughtCategoryFilter( attribute ) ) - { - return false; - } } else if ( element instanceof IValue ) { @@ -112,12 +105,6 @@ public class EntryEditorWidgetFilter ext { return false; } - - // check attribute category - if ( !goesThroughtCategoryFilter( value.getAttribute() ) ) - { - return false; - } } return true; @@ -161,38 +148,6 @@ public class EntryEditorWidgetFilter ext /** - * Checks if the given attribute goes through attribute category filter. - * - * @param attribute the attribute - * - * @return true, if goes through attribute category filter - */ - private boolean goesThroughtCategoryFilter( IAttribute attribute ) - { - if ( attribute.isObjectClassAttribute() ) - { - return isShowObjectClassAttribute() || ( attribute.getEntry() instanceof IRootDSE ); - } - else if ( attribute.isMustAttribute() ) - { - return isShowMustAttributes() || ( attribute.getEntry() instanceof IRootDSE ); - } - else if ( attribute.isMayAttribute() ) - { - return isShowMayAttributes() || ( attribute.getEntry() instanceof IRootDSE ); - } - else if ( attribute.isOperationalAttribute() ) - { - return isShowOperationalAttributes() || ( attribute.getEntry() instanceof IRootDSE ); - } - else - { - return true; - } - } - - - /** * Disposes this filter. */ public void dispose() @@ -256,48 +211,4 @@ public class EntryEditorWidgetFilter ext } } - - /** - * Checks if may attributes should be shown. - * - * @return true, if may attributes should be shown - */ - public boolean isShowMayAttributes() - { - return true; - } - - - /** - * Checks if must attributes should be shown. - * - * @return true, if must attributes should be shown - */ - public boolean isShowMustAttributes() - { - return true; - } - - - /** - * Checks if the objectClass attribute should be shown. - * - * @return true, if the objectClass attribute should be shown - */ - public boolean isShowObjectClassAttribute() - { - return true; - } - - - /** - * Checks if operational attributes should be shown. - * - * @return true, if operational attributes should be shown - */ - public boolean isShowOperationalAttributes() - { - return true; - } - } Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetPreferences.java Fri Mar 26 15:33:46 2010 @@ -106,54 +106,6 @@ public class EntryEditorWidgetPreference /** - * Checks if may attributes should be shown. - * - * @return true, if may attributes should be shown - */ - public boolean isShowMayAttributes() - { - return BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MAY_ATTRIBUTES ); - } - - - /** - * Checks if must attributes should be shown. - * - * @return true, if must attributes should be shown - */ - public boolean isShowMustAttributes() - { - return BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_MUST_ATTRIBUTES ); - } - - - /** - * Checks if object class attribute should be shown. - * - * @return true, if object class attribute should be shown - */ - public boolean isShowObjectClassAttribute() - { - return BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OBJECTCLASS_ATTRIBUTES ); - } - - - /** - * Checks if operational attributes should be shown. - * - * @return true, if operational attributes should be shown - */ - public boolean isShowOperationalAttributes() - { - return BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ); - } - - - /** * Checks if object class and must attributes should be * grouped before may attributes. * Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetUniversalListener.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetUniversalListener.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetUniversalListener.java (original) +++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetUniversalListener.java Fri Mar 26 15:33:46 2010 @@ -22,7 +22,6 @@ package org.apache.directory.studio.ldap import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; -import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils; import org.apache.directory.studio.ldapbrowser.core.events.BulkModificationEvent; import org.apache.directory.studio.ldapbrowser.core.events.EmptyValueAddedEvent; @@ -254,15 +253,6 @@ public class EntryEditorWidgetUniversalL { EmptyValueAddedEvent evaEvent = ( EmptyValueAddedEvent ) event; - // show operational attributes if an operational attribute was added - if ( evaEvent.getAddedValue().getAttribute().isOperationalAttribute() - && !BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ) - { - BrowserCommonActivator.getDefault().getPreferenceStore().setValue( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES, true ); - } - // select the added value and start editing viewer.setSelection( new StructuredSelection( evaEvent.getAddedValue() ), true ); if ( startEditAction.isEnabled() && viewer.getControl().isFocusControl() ) Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java Fri Mar 26 15:33:46 2010 @@ -25,8 +25,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.directory.studio.connection.ui.RunnableContextRunner; -import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator; -import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction; import org.apache.directory.studio.ldapbrowser.core.jobs.InitializeAttributesRunnable; import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable; @@ -234,25 +232,22 @@ public abstract class CopyEntryAsAction */ public boolean isEnabled() { - boolean showOperational = BrowserCommonActivator.getDefault().getPreferenceStore().getBoolean( - BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ); - if ( getSelectedSearchResults().length > 0 && getSelectedEntries().length + getSelectedBookmarks().length + getSelectedSearches().length == 0 ) { return ( this.mode == MODE_RETURNING_ATTRIBUTES_ONLY || this.mode == MODE_NORMAL - || this.mode == MODE_DN_ONLY || ( this.mode == MODE_INCLUDE_OPERATIONAL_ATTRIBUTES && showOperational ) ); + || this.mode == MODE_DN_ONLY || this.mode == MODE_INCLUDE_OPERATIONAL_ATTRIBUTES ); } if ( getSelectedEntries().length + getSelectedSearchResults().length + getSelectedBookmarks().length > 0 && getSelectedSearches().length == 0 ) { - return ( this.mode == MODE_NORMAL || this.mode == MODE_DN_ONLY || ( this.mode == MODE_INCLUDE_OPERATIONAL_ATTRIBUTES && showOperational ) ); + return ( this.mode == MODE_NORMAL || this.mode == MODE_DN_ONLY || this.mode == MODE_INCLUDE_OPERATIONAL_ATTRIBUTES ); } if ( getSelectedEntries().length + getSelectedSearchResults().length + getSelectedBookmarks().length == 0 && getSelectedSearches().length == 1 && getSelectedSearches()[0].getSearchResults() != null && getSelectedSearches()[0].getSearchResults().length > 0 ) { - return ( this.mode != MODE_INCLUDE_OPERATIONAL_ATTRIBUTES || ( this.mode == MODE_INCLUDE_OPERATIONAL_ATTRIBUTES && showOperational ) ); + return true; } return false; } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java Fri Mar 26 15:33:46 2010 @@ -67,9 +67,6 @@ import org.eclipse.ui.actions.Contributi public class EntryEditorActionGroup extends EntryEditorWidgetActionGroup { - /** The show operational attributes action. */ - private ShowOperationalAttributesAction showOperationalAttributesAction; - /** The toggle auto save action */ private ToggleAutosaveAction toggleAutosaveAction; @@ -183,7 +180,6 @@ public class EntryEditorActionGroup exte openEntryValueEditorActionProxy = new EntryEditorActionProxy( viewer, new OpenEntryEditorAction( viewer, valueEditorManager, valueEditorManager.getEntryValueEditor(), this ) ); - showOperationalAttributesAction = new ShowOperationalAttributesAction(); toggleAutosaveAction = new ToggleAutosaveAction( entryEditor ); openEntryEditorPreferencePage = new OpenEntryEditorPreferencePageAction(); collapseAllAction = new CollapseAllAction( viewer ); @@ -253,14 +249,13 @@ public class EntryEditorActionGroup exte */ public void dispose() { - if ( showOperationalAttributesAction != null ) + if ( toggleAutosaveAction != null ) { deactivateGlobalActionHandlers(); openEntryValueEditorActionProxy.dispose(); openEntryValueEditorActionProxy = null; openEntryEditorPreferencePage = null; - showOperationalAttributesAction = null; toggleAutosaveAction = null; expandAllAction.dispose(); expandAllAction = null; @@ -301,7 +296,6 @@ public class EntryEditorActionGroup exte { menuManager.add( openSortDialogAction ); menuManager.add( new Separator() ); - menuManager.add( showOperationalAttributesAction ); menuManager.add( showDecoratedValuesAction ); menuManager.add( new Separator() ); menuManager.add( toggleAutosaveAction ); @@ -313,8 +307,6 @@ public class EntryEditorActionGroup exte { showDecoratedValuesAction.setChecked( !BrowserCommonActivator.getDefault().getPreferenceStore() .getBoolean( BrowserCommonConstants.PREFERENCE_SHOW_RAW_VALUES ) ); - showOperationalAttributesAction.setChecked( BrowserCommonActivator.getDefault().getPreferenceStore() - .getBoolean( BrowserCommonConstants.PREFERENCE_ENTRYEDITOR_SHOW_OPERATIONAL_ATTRIBUTES ) ); toggleAutosaveAction.updateSetChecked(); } } ); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java?rev=927916&r1=927915&r2=927916&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorConfiguration.java Fri Mar 26 15:33:46 2010 @@ -22,7 +22,6 @@ package org.apache.directory.studio.ldap import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetConfiguration; -import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetFilter; import org.apache.directory.studio.valueeditors.ValueEditorManager; import org.eclipse.jface.viewers.TreeViewer; @@ -51,20 +50,6 @@ public class EntryEditorConfiguration ex /** - * {@inheritDoc} - */ - public EntryEditorWidgetFilter getFilter() - { - if ( filter == null ) - { - filter = new EntryEditorFilter( getPreferences() ); - } - - return filter; - } - - - /** * Gets the value editor manager. * * @param viewer the viewer