Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 93332 invoked from network); 21 Aug 2007 08:43:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Aug 2007 08:43:21 -0000 Received: (qmail 40622 invoked by uid 500); 21 Aug 2007 08:43:18 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 40572 invoked by uid 500); 21 Aug 2007 08:43:18 -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 40561 invoked by uid 99); 21 Aug 2007 08:43:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Aug 2007 01:43:18 -0700 X-ASF-Spam-Status: No, hits=-100.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; Tue, 21 Aug 2007 08:43:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 06D121A981A; Tue, 21 Aug 2007 01:42:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r568022 - in /directory/studio/trunk/studio-apacheds-schemaeditor: ./ src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/ src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/ Date: Tue, 21 Aug 2007 08:42:57 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070821084258.06D121A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Tue Aug 21 01:42:56 2007 New Revision: 568022 URL: http://svn.apache.org/viewvc?rev=568022&view=rev Log: Improved LabelDecorator to handle also AttributeTypeImpl and ObjectClassImpl objects. Improved the SearchView to add the LabelDecorator in the TableViewer. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/plugin.xml directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/SchemaEditorTypeLabelDecorator.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/plugin.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/plugin.xml?rev=568022&r1=568021&r2=568022&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/plugin.xml (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/plugin.xml Tue Aug 21 01:42:56 2007 @@ -234,6 +234,12 @@ + + + + Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/SchemaEditorTypeLabelDecorator.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/SchemaEditorTypeLabelDecorator.java?rev=568022&r1=568021&r2=568022&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/SchemaEditorTypeLabelDecorator.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/SchemaEditorTypeLabelDecorator.java Tue Aug 21 01:42:56 2007 @@ -24,6 +24,8 @@ import org.apache.directory.shared.ldap.schema.UsageEnum; import org.apache.directory.studio.apacheds.schemaeditor.Activator; import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants; +import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl; +import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl; import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.AttributeTypeWrapper; import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.ObjectClassWrapper; import org.eclipse.jface.viewers.IDecoration; @@ -48,10 +50,7 @@ { if ( element instanceof AttributeTypeWrapper ) { - AttributeTypeWrapper atw = ( AttributeTypeWrapper ) element; - - UsageEnum usage = atw.getAttributeType().getUsage(); - + UsageEnum usage = ( ( AttributeTypeWrapper ) element ).getAttributeType().getUsage(); if ( usage == UsageEnum.USER_APPLICATIONS ) { decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, @@ -66,10 +65,41 @@ } else if ( element instanceof ObjectClassWrapper ) { - ObjectClassWrapper ocw = ( ObjectClassWrapper ) element; - - ObjectClassTypeEnum classType = ocw.getObjectClass().getType(); - + ObjectClassTypeEnum classType = ( ( ObjectClassWrapper ) element ).getObjectClass().getType(); + if ( classType == ObjectClassTypeEnum.ABSTRACT ) + { + decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_OBJECT_CLASS_OVERLAY_ABSTRACT ), IDecoration.BOTTOM_RIGHT ); + } + else if ( classType == ObjectClassTypeEnum.STRUCTURAL ) + { + decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_OBJECT_CLASS_OVERLAY_STRUCTURAL ), IDecoration.BOTTOM_RIGHT ); + } + else if ( classType == ObjectClassTypeEnum.AUXILIARY ) + { + decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_OBJECT_CLASS_OVERLAY_AUXILIARY ), IDecoration.BOTTOM_RIGHT ); + } + } + else if ( element instanceof AttributeTypeImpl ) + { + UsageEnum usage = ( ( AttributeTypeImpl ) element ).getUsage(); + if ( usage == UsageEnum.USER_APPLICATIONS ) + { + decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_ATTRIBUTE_TYPE_OVERLAY_USER_APPLICATION ), IDecoration.BOTTOM_RIGHT ); + } + else if ( ( usage == UsageEnum.DIRECTORY_OPERATION ) || ( usage == UsageEnum.DISTRIBUTED_OPERATION ) + || ( usage == UsageEnum.DSA_OPERATION ) ) + { + decoration.addOverlay( Activator.imageDescriptorFromPlugin( Activator.PLUGIN_ID, + PluginConstants.IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION ), IDecoration.BOTTOM_RIGHT ); + } + } + else if ( element instanceof ObjectClassImpl ) + { + ObjectClassTypeEnum classType = ( ( ObjectClassImpl ) element ).getType(); if ( classType == ObjectClassTypeEnum.ABSTRACT ) { decoration.addOverlay( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java?rev=568022&r1=568021&r2=568022&view=diff ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/views/SearchView.java Tue Aug 21 01:42:56 2007 @@ -36,6 +36,7 @@ import org.apache.directory.studio.apacheds.schemaeditor.view.search.SearchPage; import org.apache.directory.studio.apacheds.schemaeditor.view.search.SearchPage.SearchScopeEnum; import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.viewers.DecoratingLabelProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; @@ -402,7 +403,8 @@ // Creating the TableViewer resultsTableViewer = new TableViewer( resultsTable ); - resultsTableViewer.setLabelProvider( new SearchViewLabelProvider() ); + resultsTableViewer.setLabelProvider( new DecoratingLabelProvider( new SearchViewLabelProvider(), Activator + .getDefault().getWorkbench().getDecoratorManager().getLabelDecorator() ) ); resultsTableViewer.setContentProvider( new SearchViewContentProvider() ); }