From commits-return-17416-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Mar 13 09:59:50 2008 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 19137 invoked from network); 13 Mar 2008 09:59:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2008 09:59:50 -0000 Received: (qmail 21816 invoked by uid 500); 13 Mar 2008 09:59:47 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 21778 invoked by uid 500); 13 Mar 2008 09:59:47 -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 21767 invoked by uid 99); 13 Mar 2008 09:59:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 02:59:46 -0700 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 09:59:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 97DF21A983E; Thu, 13 Mar 2008 02:59:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r636689 - /directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Date: Thu, 13 Mar 2008 09:59:28 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080313095928.97DF21A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Thu Mar 13 02:59:25 2008 New Revision: 636689 URL: http://svn.apache.org/viewvc?rev=636689&view=rev Log: Fix for DIRSTUDIO-290: fixed image handling in properties dialog Modified: directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Modified: directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java?rev=636689&r1=636688&r2=636689&view=diff ============================================================================== --- directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java (original) +++ directory/studio/branches/1.1.0/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/preferences/ValueEditorsPreferencePage.java Thu Mar 13 02:59:25 2008 @@ -24,7 +24,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -41,6 +43,7 @@ import org.apache.directory.studio.valueeditors.ValueEditorManager; import org.apache.directory.studio.valueeditors.ValueEditorManager.ValueEditorExtension; import org.eclipse.jface.preference.PreferencePage; +import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ArrayContentProvider; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; @@ -122,6 +125,8 @@ /** The syntax remove button. */ private Button syntaxRemoveButton; + /** The map of images */ + private Map imageMap; /** * Creates a new instance of ValueEditorsPreferencePage. @@ -130,6 +135,7 @@ { super( "Value Editors" ); super.setDescription( "Specify value editors:" ); + this.imageMap = new HashMap(); } @@ -144,6 +150,24 @@ /** * {@inheritDoc} */ + public void dispose() + { + if ( imageMap != null ) { + for ( Image image : imageMap.values() ) + { + if ( image != null && !image.isDisposed() ) + { + image.dispose(); + } + } + } + super.dispose(); + } + + + /** + * {@inheritDoc} + */ protected Control createContents( Composite parent ) { Composite composite = BaseWidgetUtils.createColumnContainer( parent, 1, 1 ); @@ -552,7 +576,16 @@ if ( index == 2 ) { ValueEditorExtension vee = class2ValueEditorExtensionMap.get( relation.getValueEditorClassName() ); - return vee != null ? vee.icon.createImage() : null; + if ( vee != null ) + { + if ( !imageMap.containsKey( vee.icon ) ) + { + Image image = vee.icon.createImage(); + imageMap.put( vee.icon, image ); + } + return imageMap.get( vee.icon ); + } + return null; } } @@ -601,7 +634,16 @@ if ( index == 2 ) { ValueEditorExtension vee = class2ValueEditorExtensionMap.get( relation.getValueEditorClassName() ); - return vee != null ? vee.icon.createImage() : null; + if ( vee != null ) + { + if ( !imageMap.containsKey( vee.icon ) ) + { + Image image = vee.icon.createImage(); + imageMap.put( vee.icon, image ); + } + return imageMap.get( vee.icon ); + } + return null; } }