Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 19752 invoked from network); 27 Feb 2007 16:36:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Feb 2007 16:36:37 -0000 Received: (qmail 83963 invoked by uid 500); 27 Feb 2007 16:36:46 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 83922 invoked by uid 500); 27 Feb 2007 16:36:46 -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 83910 invoked by uid 99); 27 Feb 2007 16:36:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Feb 2007 08:36:46 -0800 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Feb 2007 08:36:36 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 7F8791A981D; Tue, 27 Feb 2007 08:36:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r512311 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller: HierarchyViewController.java SchemasViewController.java Date: Tue, 27 Feb 2007 16:36:15 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070227163616.7F8791A981D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue Feb 27 08:36:13 2007 New Revision: 512311 URL: http://svn.apache.org/viewvc?view=rev&rev=512311 Log: Added a verification on the PropertyChangeListener to refresh the TreeViewer only when it is necessary. Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java?view=diff&rev=512311&r1=512310&r2=512311 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java Tue Feb 27 08:36:13 2007 @@ -21,7 +21,11 @@ package org.apache.directory.ldapstudio.schemas.controller; +import java.util.ArrayList; +import java.util.List; + import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.actions.CollapseAllAction; import org.apache.directory.ldapstudio.schemas.controller.actions.HideAttributeTypesAction; import org.apache.directory.ldapstudio.schemas.controller.actions.HideObjectClassesAction; @@ -62,6 +66,9 @@ { /** The logger */ private static Logger logger = Logger.getLogger( HierarchyViewController.class ); + + /** The authorized Preferences keys*/ + List authorizedPrefs; /** The associated view */ private HierarchyView view; @@ -81,7 +88,8 @@ public HierarchyViewController( HierarchyView view ) { this.view = view; - + + initAuthorizedPrefs(); initActions(); initToolbar(); initMenu(); @@ -90,6 +98,22 @@ } + private void initAuthorizedPrefs() + { + authorizedPrefs = new ArrayList(); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY ); + authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER ); + } + + /** * Initializes the Actions. */ @@ -202,8 +226,11 @@ * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent) */ public void propertyChange( PropertyChangeEvent event ) - { - view.getViewer().refresh(); + { + if ( authorizedPrefs.contains( event.getProperty() ) ) + { + view.getViewer().refresh(); + } } } ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java?view=diff&rev=512311&r1=512310&r2=512311 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemasViewController.java Tue Feb 27 08:36:13 2007 @@ -21,7 +21,11 @@ package org.apache.directory.ldapstudio.schemas.controller; +import java.util.ArrayList; +import java.util.List; + import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.actions.CollapseAllAction; import org.apache.directory.ldapstudio.schemas.controller.actions.CreateANewAttributeTypeAction; import org.apache.directory.ldapstudio.schemas.controller.actions.CreateANewObjectClassAction; @@ -93,6 +97,9 @@ /** The associated view */ private SchemasView view; + /** The authorized Preferences keys*/ + List authorizedPrefs; + /** The Drag'n'Drop FileTransfer Object */ private final static FileTransfer fileTransfer = FileTransfer.getInstance(); @@ -125,6 +132,7 @@ { this.view = view; + initAuthorizedPrefs(); initActions(); initToolbar(); initMenu(); @@ -136,6 +144,18 @@ } + private void initAuthorizedPrefs() + { + authorizedPrefs = new ArrayList(); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_GROUPING ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_SORTING_BY ); + authorizedPrefs.add( PluginConstants.PREFS_SCHEMAS_VIEW_SORTING_ORDER ); + } + + /** * Initializes the Actions. */ @@ -569,7 +589,10 @@ */ public void propertyChange( PropertyChangeEvent event ) { - view.getViewer().refresh(); + if ( authorizedPrefs.contains( event.getProperty() ) ) + { + view.getViewer().refresh(); + } } } ); }