You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2007/08/21 11:31:50 UTC
svn commit: r568038 -
/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/
Author: pamarcelot
Date: Tue Aug 21 02:31:49 2007
New Revision: 568038
URL: http://svn.apache.org/viewvc?rev=568038&view=rev
Log:
Added LabelDecorator to the ObjectClassSelectionDialog and AttributeTypeSelectionDialog.
Modified:
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=568038&r1=568037&r2=568038&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Tue Aug 21 02:31:49 2007
@@ -24,10 +24,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.apacheds.schemaeditor.Activator;
import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -150,7 +152,9 @@
attributeTypesTableViewer.setContentProvider( new AttributeTypeSelectionDialogContentProvider(
hiddenAttributeTypes ) );
- attributeTypesTableViewer.setLabelProvider( new AttributeTypeSelectionDialogLabelProvider() );
+ attributeTypesTableViewer.setLabelProvider( new DecoratingLabelProvider(
+ new AttributeTypeSelectionDialogLabelProvider(), Activator.getDefault().getWorkbench()
+ .getDecoratorManager().getLabelDecorator() ) );
// We need to force the input to load the complete list of attribute types
attributeTypesTableViewer.setInput( "" ); //$NON-NLS-1$
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=568038&r1=568037&r2=568038&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Tue Aug 21 02:31:49 2007
@@ -25,7 +25,6 @@
import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants;
import org.apache.directory.studio.apacheds.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.apacheds.schemaeditor.view.ViewUtils;
-import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -37,12 +36,12 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class AttributeTypeSelectionDialogLabelProvider extends LabelProvider implements ITableLabelProvider
+public class AttributeTypeSelectionDialogLabelProvider extends LabelProvider
{
/* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
+ * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
- public Image getColumnImage( Object element, int columnIndex )
+ public Image getImage( Object element )
{
if ( element instanceof AttributeTypeImpl )
{
@@ -56,9 +55,9 @@
/* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
+ * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
*/
- public String getColumnText( Object element, int columnIndex )
+ public String getText( Object element )
{
if ( element instanceof AttributeTypeImpl )
{
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java?rev=568038&r1=568037&r2=568038&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java Tue Aug 21 02:31:49 2007
@@ -24,10 +24,12 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.apacheds.schemaeditor.Activator;
import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.swt.SWT;
@@ -149,7 +151,8 @@
tableViewer.setUseHashlookup( true );
tableViewer.setContentProvider( new ObjectClassSelectionDialogContentProvider( hiddenObjectClasses ) );
- tableViewer.setLabelProvider( new ObjectClassSelectionDialogLabelProvider() );
+ tableViewer.setLabelProvider( new DecoratingLabelProvider( new ObjectClassSelectionDialogLabelProvider(),
+ Activator.getDefault().getWorkbench().getDecoratorManager().getLabelDecorator() ) );
// We need to force the input to load the complete list of attribute types
tableViewer.setInput( "" ); //$NON-NLS-1$
Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=568038&r1=568037&r2=568038&view=diff
==============================================================================
--- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Tue Aug 21 02:31:49 2007
@@ -25,7 +25,6 @@
import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants;
import org.apache.directory.studio.apacheds.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.apacheds.schemaeditor.view.ViewUtils;
-import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -37,12 +36,12 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public class ObjectClassSelectionDialogLabelProvider extends LabelProvider implements ITableLabelProvider
+public class ObjectClassSelectionDialogLabelProvider extends LabelProvider
{
/* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object, int)
+ * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
*/
- public Image getColumnImage( Object element, int columnIndex )
+ public Image getImage( Object element )
{
if ( element instanceof ObjectClassImpl )
{
@@ -56,9 +55,9 @@
/* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object, int)
+ * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
*/
- public String getColumnText( Object element, int columnIndex )
+ public String getText( Object element )
{
if ( element instanceof ObjectClassImpl )
{