directory-commits mailing list archives

Site index · List index

Message view	« Date » · « Thread »
Top	« Date » · « Thread »
From	pamarce...@apache.org
Subject	svn commit: r512297 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas: controller/ controller/actions/ view/ view/editors/ view/preferences/ view/viewers/ view/viewers/wrappers/ view/wizards/
Date	Tue, 27 Feb 2007 16:06:29 GMT
Author: pamarcelot Date: Tue Feb 27 08:06:27 2007 New Revision: 512297 URL: http://svn.apache.org/viewvc?view=rev&rev=512297 Log: Refactored constants into a unique interface : PluginConstants. Removed: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/IImageKeys.java Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CollapseAllAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewAttributeTypeAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewObjectClassAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewSchemaAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/DeleteAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideAttributeTypesAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideObjectClassesAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewSortDialogAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/RemoveSchemaAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAllAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAsAction.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasViewPreferencePage.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewSchemaWizardPage.java Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/PreferenceInitializer.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,9 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage; -import org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage; import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage; -import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage; import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyViewSortDialog; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasViewSortDialog; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; @@ -57,15 +56,15 @@ IPreferenceStore store = Activator.getDefault().getPreferenceStore(); // Hierarchy View Preference Page - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL, - HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_ABBREVIATE, true ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH, "50" ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY, true ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, - HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_OID ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE, false ); - store.setDefault( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, "50" ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, + PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE, true ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH, "50" ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY, true ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, + PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE, false ); + store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, "50" ); // Hierarchy View Sorting store.setDefault( HierarchyViewSortDialog.PREFS_HIERARCHY_VIEW_GROUPING, @@ -76,10 +75,10 @@ HierarchyViewSortDialog.PREFS_HIERARCHY_VIEW_SORTING_ORDER_ASCENDING ); // Schemas View Preference Page - store.setDefault( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL, - SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ); - store.setDefault( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_ABBREVIATE, true ); - store.setDefault( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH, "50" ); + store.setDefault( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL, + PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ); + store.setDefault( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE, true ); + store.setDefault( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH, "50" ); // Schemas View Sorting store.setDefault( SchemasViewSortDialog.PREFS_SCHEMAS_VIEW_GROUPING, Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CollapseAllAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CollapseAllAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CollapseAllAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CollapseAllAction.java Tue Feb 27 08:06:27 2007 @@ -20,7 +20,7 @@ package org.apache.directory.ldapstudio.schemas.controller.actions; import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -45,7 +45,7 @@ { super( "Collapse All"); setToolTipText( getText() ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.COLLAPSE_ALL ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_COLLAPSE_ALL ) ); setEnabled( true ); this.viewer = viewer; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewAttributeTypeAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewAttributeTypeAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewAttributeTypeAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewAttributeTypeAction.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.Schema; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode; @@ -61,7 +61,7 @@ // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_ATTRIBUTETYPE ); setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.CREATE_A_NEW_ATTRIBUTETYPE ) ); + PluginConstants.IMG_CREATE_A_NEW_ATTRIBUTETYPE ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewObjectClassAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewObjectClassAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewObjectClassAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewObjectClassAction.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.Schema; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode; @@ -61,7 +61,7 @@ // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_OBJECTCLASS ); setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.CREATE_A_NEW_OBJECTCLASS ) ); + PluginConstants.IMG_CREATE_A_NEW_OBJECTCLASS ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewSchemaAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewSchemaAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewSchemaAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/CreateANewSchemaAction.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.wizards.CreateANewSchemaWizard; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.StructuredSelection; @@ -51,7 +51,7 @@ // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_SCHEMA ); setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.CREATE_A_NEW_SCHEMA ) ); + PluginConstants.IMG_CREATE_A_NEW_SCHEMA ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/DeleteAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/DeleteAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/DeleteAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/DeleteAction.java Tue Feb 27 08:06:27 2007 @@ -22,12 +22,12 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.AttributeType; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.Schema; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassFormEditorInput; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; @@ -71,7 +71,7 @@ setId( ICommandIds.CMD_DELETE ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_DELETE ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.DELETE ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_DELETE ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideAttributeTypesAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideAttributeTypesAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideAttributeTypesAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideAttributeTypesAction.java Tue Feb 27 08:06:27 2007 @@ -21,7 +21,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView; import org.eclipse.jface.action.Action; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -54,7 +54,7 @@ super( "Hide Attribute Types", AS_CHECK_BOX ); super.setActionDefinitionId( Activator.PLUGIN_ID + "hideAttributeTypes" ); super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.HIDE_ATTRIBUTE_TYPES ) ); + PluginConstants.IMG_HIDE_ATTRIBUTE_TYPES ) ); super.setEnabled( true ); hierarchyView = view; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideObjectClassesAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideObjectClassesAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideObjectClassesAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/HideObjectClassesAction.java Tue Feb 27 08:06:27 2007 @@ -21,7 +21,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView; import org.eclipse.jface.action.Action; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -54,7 +54,7 @@ super( "Hide Object Classes", AS_CHECK_BOX ); super.setActionDefinitionId( Activator.PLUGIN_ID + "hideObjectClasses" ); super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.HIDE_OBJECT_CLASSES ) ); + PluginConstants.IMG_HIDE_OBJECT_CLASSES ) ); super.setEnabled( true ); hierarchyView = view; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java Tue Feb 27 08:06:27 2007 @@ -21,10 +21,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.AttributeType; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.editors.AttributeTypeFormEditor; import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassFormEditor; import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditor; @@ -179,7 +179,7 @@ super( "Link with Editor", AS_CHECK_BOX ); super.setActionDefinitionId( Activator.PLUGIN_ID + "linkwitheditorschemasview" ); super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.LINK_WITH_EDITOR ) ); + PluginConstants.IMG_LINK_WITH_EDITOR ) ); super.setEnabled( true ); hierarchyView = view; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemasView.java Tue Feb 27 08:06:27 2007 @@ -21,10 +21,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.AttributeType; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.editors.AttributeTypeFormEditor; import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassFormEditor; import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditor; @@ -178,7 +178,7 @@ super( "Link with Editor", AS_CHECK_BOX ); super.setActionDefinitionId( Activator.PLUGIN_ID + "linkwitheditorschemasview" ); super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.LINK_WITH_EDITOR ) ); + PluginConstants.IMG_LINK_WITH_EDITOR ) ); super.setEnabled( true ); schemasView = view; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java Tue Feb 27 08:06:27 2007 @@ -22,7 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyViewSortDialog; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; @@ -47,7 +47,7 @@ public OpenHierarchyViewSortDialogAction() { super( "Sorting..." ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SORT ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SORT ) ); setEnabled( true ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenLocalFileAction.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; import org.apache.directory.ldapstudio.schemas.model.Schema.SchemaType; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaPreferencePage; import org.apache.log4j.Logger; import org.eclipse.core.runtime.preferences.ConfigurationScope; @@ -55,7 +55,7 @@ setId( ICommandIds.CMD_OPEN_LOCAL ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_OPEN_LOCAL ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OPEN_LOCAL ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OPEN ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaSourceCode.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditor; import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditorInput; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; @@ -62,7 +62,7 @@ setId( ICommandIds.CMD_OPEN_SCHEMA_SOURCE_CODE ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_OPEN_SCHEMA_SOURCE_CODE ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewSortDialogAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewSortDialogAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewSortDialogAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewSortDialogAction.java Tue Feb 27 08:06:27 2007 @@ -21,7 +21,7 @@ package org.apache.directory.ldapstudio.schemas.controller.actions; import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasViewSortDialog; import org.eclipse.jface.action.Action; import org.eclipse.ui.PlatformUI; @@ -46,7 +46,7 @@ public OpenSchemasViewSortDialogAction() { super( "Sorting..." ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SORT ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SORT ) ); setEnabled( true ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/RemoveSchemaAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/RemoveSchemaAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/RemoveSchemaAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/RemoveSchemaAction.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.Schema; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper; @@ -57,7 +57,7 @@ // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_REMOVE_SCHEMA ); setImageDescriptor( AbstractUIPlugin - .imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.REMOVE_SCHEMA ) ); + .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_REMOVE_SCHEMA ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAction.java Tue Feb 27 08:06:27 2007 @@ -22,9 +22,9 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.Schema; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode; @@ -66,7 +66,7 @@ setId( ICommandIds.CMD_SAVE ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_SAVE ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SAVE ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SAVE ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAllAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAllAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAllAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAllAction.java Tue Feb 27 08:06:27 2007 @@ -22,9 +22,9 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.log4j.Logger; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -61,7 +61,7 @@ setId( ICommandIds.CMD_SAVE_ALL ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_SAVE_ALL ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SAVE_ALL ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SAVE_ALL ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAsAction.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAsAction.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAsAction.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/SaveAsAction.java Tue Feb 27 08:06:27 2007 @@ -22,9 +22,9 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.ICommandIds; import org.apache.directory.ldapstudio.schemas.model.Schema; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.SchemaWrapper; import org.apache.log4j.Logger; @@ -64,7 +64,7 @@ setId( ICommandIds.CMD_SAVE_AS ); // Associate the action with a pre-defined command, to allow key bindings. setActionDefinitionId( ICommandIds.CMD_SAVE_AS ); - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SAVE_AS ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SAVE_AS ) ); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/AttributeTypeSelectionDialogLabelProvider.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.SchemaElement; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -37,7 +37,7 @@ { if ( columnIndex == 0 ) { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE ) .createImage(); } return null; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/editors/ObjectClassFormEditorOverviewPage.java Tue Feb 27 08:06:27 2007 @@ -28,11 +28,11 @@ import java.util.HashSet; import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.controller.SchemasViewController; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.Schema; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum; import org.apache.log4j.Logger; import org.eclipse.jface.dialogs.MessageDialog; @@ -857,7 +857,7 @@ { TableItem item = new TableItem( mandatoryAttributesTable, SWT.NONE, i ); item.setImage( AbstractUIPlugin - .imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() ); + .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE ).createImage() ); item.setText( mustArray[i] ); if ( ( selectionIndex != -1 ) && ( mustArray[i].equals( selectAttribute ) ) ) { @@ -886,7 +886,7 @@ { TableItem item = new TableItem( optionalAttributesTable, SWT.NONE, i ); item.setImage( AbstractUIPlugin - .imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ).createImage() ); + .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE ).createImage() ); item.setText( mayArray[i] ); if ( ( selectionIndex != -1 ) && ( mayArray[i].equals( selectAttribute ) ) ) { Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java Tue Feb 27 08:06:27 2007 @@ -22,6 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -62,41 +63,6 @@ /** The OID category / private static final String OID = "OID"; - /* The preference ID for Label / - public static final String PREFS_HIERARCHY_VIEW_LABEL = HierarchyViewPreferencePage.ID + ".label.labelValue"; - - /* The preference value for First Name label / - public static final int PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME = 0; - - /* The preference value for All Aliases label / - public static final int PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES = 1; - - /* The preference value for OID label / - public static final int PREFS_HIERARCHY_VIEW_LABEL_OID = 2; - - /* The preference ID for Abbreviate / - public static final String PREFS_HIERARCHY_VIEW_ABBREVIATE = HierarchyViewPreferencePage.ID + ".label.abbreviate"; - - /* The preference ID for Abbreviate Max Length/ - public static final String PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH = HierarchyViewPreferencePage.ID - + ".label.abbreviate.maxLength"; - - /* The preference ID for Display Secondary Label / - public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY = HierarchyViewPreferencePage.ID - + ".secondaryLabel.display"; - - /* The preference ID for Secondary Label / - public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL = HierarchyViewPreferencePage.ID - + ".secondaryLabel.labelValue"; - - /* The preference ID for Abbreviate Secondary Label / - public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE = HierarchyViewPreferencePage.ID - + ".secondaryLabel.abbreviate"; - - /* The preference ID for Abbreviate Secondary Label Max Length/ - public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH = HierarchyViewPreferencePage.ID - + ".secondaryLabel.abbreviate.maxLength"; - // UI fields private Combo labelCombo; private Button limitButton; @@ -305,17 +271,17 @@ { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); - labelCombo.select( store.getInt( PREFS_HIERARCHY_VIEW_LABEL ) ); - limitButton.setSelection( store.getBoolean( PREFS_HIERARCHY_VIEW_ABBREVIATE ) ); + labelCombo.select( store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ) ); + limitButton.setSelection( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ) ); lengthText.setEnabled( limitButton.getSelection() ); - lengthText.setText( store.getString( PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) ); + lengthText.setText( store.getString( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) ); - secondaryLabelButtonDisplay.setSelection( store.getBoolean( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ); - secondaryLabelCombo.select( store.getInt( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ) ); - secondaryLabelLimitButton.setSelection( store.getBoolean( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ) ); + secondaryLabelButtonDisplay.setSelection( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ); + secondaryLabelCombo.select( store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ) ); + secondaryLabelLimitButton.setSelection( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ) ); secondaryLabelLengthText - .setText( store.getString( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) ); - if ( store.getBoolean( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ) + .setText( store.getString( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) ); + if ( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ) { secondaryLabelCombo.setEnabled( true ); secondaryLabelLimitButton.setEnabled( true ); @@ -379,18 +345,18 @@ { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); - labelCombo.select( store.getDefaultInt( PREFS_HIERARCHY_VIEW_LABEL ) ); - limitButton.setSelection( store.getDefaultBoolean( PREFS_HIERARCHY_VIEW_ABBREVIATE ) ); + labelCombo.select( store.getDefaultInt( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ) ); + limitButton.setSelection( store.getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ) ); lengthText.setEnabled( limitButton.getSelection() ); - lengthText.setText( store.getDefaultString( PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) ); + lengthText.setText( store.getDefaultString( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) ); secondaryLabelButtonDisplay.setSelection( store - .getDefaultBoolean( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ); - secondaryLabelCombo.select( store.getDefaultInt( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ) ); + .getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) ); + secondaryLabelCombo.select( store.getDefaultInt( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ) ); secondaryLabelLimitButton.setSelection( store - .getDefaultBoolean( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ) ); + .getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ) ); secondaryLabelLengthText.setText( store - .getDefaultString( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) ); + .getDefaultString( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) ); if ( secondaryLabelButtonDisplay.getSelection() ) { @@ -418,34 +384,34 @@ if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( FIRST_NAME ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_LABEL, PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ); } else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( ALL_ALIASES ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_LABEL, PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); } else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( OID ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_LABEL, PREFS_HIERARCHY_VIEW_LABEL_OID ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ); } - store.setValue( PREFS_HIERARCHY_VIEW_ABBREVIATE, limitButton.getSelection() ); - store.setValue( PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE, limitButton.getSelection() ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() ); - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY, secondaryLabelButtonDisplay.getSelection() ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY, secondaryLabelButtonDisplay.getSelection() ); if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( FIRST_NAME ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ); } else if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( ALL_ALIASES ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ); } else if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( OID ) ) { - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PREFS_HIERARCHY_VIEW_LABEL_OID ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ); } - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE, secondaryLabelLimitButton.getSelection() ); - store.setValue( PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, secondaryLabelLengthText.getText() ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE, secondaryLabelLimitButton.getSelection() ); + store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, secondaryLabelLengthText.getText() ); return true; } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasViewPreferencePage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasViewPreferencePage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasViewPreferencePage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemasViewPreferencePage.java Tue Feb 27 08:06:27 2007 @@ -22,6 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.swt.SWT; @@ -62,25 +63,6 @@ /* The OID category / private static final String OID = "OID"; - /* The preference ID for Label / - public static final String PREFS_SCHEMAS_VIEW_LABEL = SchemasViewPreferencePage.ID + ".label.labelValue"; - - /* The preference value for First Name label / - public static final int PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME = 0; - - /* The preference value for All Aliases label / - public static final int PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES = 1; - - /* The preference value for OID label / - public static final int PREFS_SCHEMAS_VIEW_LABEL_OID = 2; - - /* The preference ID for Abbreviate / - public static final String PREFS_SCHEMAS_VIEW_ABBREVIATE = SchemasViewPreferencePage.ID + ".label.abbreviate"; - - /* The preference ID for Abbreviate Max Length/ - public static final String PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH = SchemasViewPreferencePage.ID - + ".label.abbreviate.maxLength"; - // UI fields private Combo labelCombo; private Button limitButton; @@ -205,10 +187,10 @@ { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); - labelCombo.select( store.getInt( PREFS_SCHEMAS_VIEW_LABEL ) ); - limitButton.setSelection( store.getBoolean( PREFS_SCHEMAS_VIEW_ABBREVIATE ) ); + labelCombo.select( store.getInt( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL ) ); + limitButton.setSelection( store.getBoolean( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE ) ); lengthText.setEnabled( limitButton.getSelection() ); - lengthText.setText( store.getString( PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ) ); + lengthText.setText( store.getString( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ) ); } @@ -234,10 +216,10 @@ { IPreferenceStore store = Activator.getDefault().getPreferenceStore(); - labelCombo.select( store.getDefaultInt( PREFS_SCHEMAS_VIEW_LABEL ) ); - limitButton.setSelection( store.getDefaultBoolean( PREFS_SCHEMAS_VIEW_ABBREVIATE ) ); + labelCombo.select( store.getDefaultInt( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL ) ); + limitButton.setSelection( store.getDefaultBoolean( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE ) ); lengthText.setEnabled( limitButton.getSelection() ); - lengthText.setText( store.getDefaultString( PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ) ); + lengthText.setText( store.getDefaultString( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ) ); super.performDefaults(); } @@ -252,18 +234,18 @@ if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( FIRST_NAME ) ) { - store.setValue( PREFS_SCHEMAS_VIEW_LABEL, PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ); + store.setValue( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL, PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ); } else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( ALL_ALIASES ) ) { - store.setValue( PREFS_SCHEMAS_VIEW_LABEL, PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ); + store.setValue( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL, PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ); } else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( OID ) ) { - store.setValue( PREFS_SCHEMAS_VIEW_LABEL, PREFS_SCHEMAS_VIEW_LABEL_OID ); + store.setValue( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL, PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_OID ); } - store.setValue( PREFS_SCHEMAS_VIEW_ABBREVIATE, limitButton.getSelection() ); - store.setValue( PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() ); + store.setValue( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE, limitButton.getSelection() ); + store.setValue( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() ); return true; } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewLabelProvider.java Tue Feb 27 08:06:27 2007 @@ -22,7 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.DisplayableTreeElement; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper; @@ -61,28 +61,28 @@ { String label = ""; - int labelValue = store.getInt( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL ); - boolean abbreviate = store.getBoolean( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_ABBREVIATE ); - int abbreviateMaxLength = store.getInt( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ); + int labelValue = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ); + boolean abbreviate = store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ); + int abbreviateMaxLength = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ); boolean secondaryLabelDisplay = store - .getBoolean( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ); - int secondaryLabelValue = store.getInt( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ); + .getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ); + int secondaryLabelValue = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ); boolean secondaryLabelAbbreviate = store - .getBoolean( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ); + .getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ); int secondaryLabelAbbreviateMaxLength = store - .getInt( HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ); + .getInt( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ); if ( obj instanceof AttributeTypeWrapper ) { - if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) + if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) { label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0]; } - else if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) + else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) { label = concateNames( ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames() ); } - else if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_OID ) + else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ) { label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getOid(); } @@ -94,15 +94,15 @@ } else if ( obj instanceof ObjectClassWrapper ) { - if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) + if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) { label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0]; } - else if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) + else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) { label = concateNames( ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames() ); } - else if ( labelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_OID ) + else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ) { label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getOid(); } @@ -128,30 +128,30 @@ String secondaryLabel = ""; if ( obj instanceof AttributeTypeWrapper ) { - if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) + if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) { secondaryLabel = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0]; } - else if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) + else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) { secondaryLabel = concateNames( ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames() ); } - else if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_OID ) + else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ) { secondaryLabel = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getOid(); } } else if ( obj instanceof ObjectClassWrapper ) { - if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) + if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME ) { secondaryLabel = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0]; } - else if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) + else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES ) { secondaryLabel = concateNames( ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames() ); } - else if ( secondaryLabelValue == HierarchyViewPreferencePage.PREFS_HIERARCHY_VIEW_LABEL_OID ) + else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID ) { secondaryLabel = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getOid(); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasViewLabelProvider.java Tue Feb 27 08:06:27 2007 @@ -22,7 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.DisplayableTreeElement; import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper; @@ -62,21 +62,21 @@ { String label = ""; - int labelValue = store.getInt( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL ); - boolean abbreviate = store.getBoolean( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_ABBREVIATE ); - int abbreviateMaxLength = store.getInt( SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ); + int labelValue = store.getInt( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL ); + boolean abbreviate = store.getBoolean( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE ); + int abbreviateMaxLength = store.getInt( PluginConstants.PREFS_SCHEMAS_VIEW_ABBREVIATE_MAX_LENGTH ); if ( obj instanceof AttributeTypeWrapper ) { - if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ) + if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ) { label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0]; } - else if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ) + else if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ) { label = concateNames( ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames() ); } - else if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_OID ) + else if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_OID ) { label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getOid(); } @@ -88,15 +88,15 @@ } else if ( obj instanceof ObjectClassWrapper ) { - if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ) + if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_FIRST_NAME ) { label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0]; } - else if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ) + else if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_ALL_ALIASES ) { label = concateNames( ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames() ); } - else if ( labelValue == SchemasViewPreferencePage.PREFS_SCHEMAS_VIEW_LABEL_OID ) + else if ( labelValue == PluginConstants.PREFS_SCHEMAS_VIEW_LABEL_OID ) { label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getOid(); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SearchViewLabelProvider.java Tue Feb 27 08:06:27 2007 @@ -22,10 +22,10 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.AttributeType; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.SchemaElement; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; @@ -48,13 +48,13 @@ { if ( element instanceof ObjectClass ) { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS ) .createImage(); } if ( element instanceof AttributeType ) { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE ) .createImage(); } } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/AttributeTypeWrapper.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.AttributeType; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -87,7 +87,7 @@ / public Image getDisplayImage() { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE ) .createImage(); } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/IntermediateNode.java Tue Feb 27 08:06:27 2007 @@ -22,7 +22,7 @@ import org.apache.directory.ldapstudio.schemas.Activator; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -120,10 +120,10 @@ return PlatformUI.getWorkbench().getSharedImages().getImage( imageKey ); case ATTRIBUTE_TYPE_FOLDER: return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.FOLDER_ATTRIBUTE_TYPE ).createImage(); + PluginConstants.IMG_FOLDER_ATTRIBUTE_TYPE ).createImage(); case OBJECT_CLASS_FOLDER: return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, - IImageKeys.FOLDER_OBJECT_CLASS ).createImage(); + PluginConstants.IMG_FOLDER_OBJECT_CLASS ).createImage(); } String imageKey = ISharedImages.IMG_OBJ_FOLDER; Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/ObjectClassWrapper.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.ISharedImages; import org.eclipse.ui.PlatformUI; @@ -128,10 +128,10 @@ String imageKey = ISharedImages.IMG_OBJS_WARN_TSK; if ( state == State.resolved ) - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS ) .createImage(); else if ( state == State.unResolved ) - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS_WARNING ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS_WARNING ) .createImage(); return PlatformUI.getWorkbench().getSharedImages().getImage( imageKey ); Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaWrapper.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.Schema; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -103,12 +103,12 @@ { if ( this.mySchema.type.equals( Schema.SchemaType.coreSchema ) ) { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA_CORE ) + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA_CORE ) .createImage(); } else { - return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA ).createImage(); + return AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA ).createImage(); } } Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewAttributeTypeWizardPage.java Tue Feb 27 08:06:27 2007 @@ -24,11 +24,11 @@ import java.util.Hashtable; import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.AttributeType; import org.apache.directory.ldapstudio.schemas.model.OID; import org.apache.directory.ldapstudio.schemas.model.SchemaElement; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -76,7 +76,7 @@ super( "CreateANewAttributeTypeWizardPage" ); //$NON-NLS-1$ setTitle( Messages.getString( "CreateANewAttributeTypeWizardPage.Page_Title" ) ); //$NON-NLS-1$ setDescription( Messages.getString( "CreateANewAttributeTypeWizardPage.Page_Description" ) ); //$NON-NLS-1$ - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, IImageKeys.ATTRIBUTE_TYPE_NEW_WIZARD ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin(Activator.PLUGIN_ID, PluginConstants.IMG_ATTRIBUTE_TYPE_NEW_WIZARD ) ); this.selection = selection; typesByName = SchemaPool.getInstance().getAttributeTypesAsHashTableByName(); Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewObjectClassWizardPage.java Tue Feb 27 08:06:27 2007 @@ -24,11 +24,11 @@ import java.util.Hashtable; import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.OID; import org.apache.directory.ldapstudio.schemas.model.ObjectClass; import org.apache.directory.ldapstudio.schemas.model.SchemaElement; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.apache.directory.ldapstudio.schemas.view.preferences.GeneralPreferencePage; import org.eclipse.core.runtime.preferences.ConfigurationScope; import org.eclipse.core.runtime.preferences.IEclipsePreferences; @@ -76,7 +76,7 @@ super( "CreateANewObjecClassWizardPage" ); //$NON-NLS-1$ setTitle( Messages.getString( "CreateANewObjectClassWizardPage.Page_Title" ) ); //$NON-NLS-1$ setDescription( Messages.getString( "CreateANewObjectClassWizardPage.Page_Description" ) ); //$NON-NLS-1$ - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.OBJECT_CLASS_NEW_WIZARD ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) ); this.selection = selection; classesByName = SchemaPool.getInstance().getObjectClassesAsHashTableByName(); Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewSchemaWizardPage.java URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewSchemaWizardPage.java?view=diff&rev=512297&r1=512296&r2=512297 ============================================================================== --- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewSchemaWizardPage.java (original) +++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/wizards/CreateANewSchemaWizardPage.java Tue Feb 27 08:06:27 2007 @@ -22,8 +22,8 @@ import org.apache.directory.ldapstudio.schemas.Activator; +import org.apache.directory.ldapstudio.schemas.PluginConstants; import org.apache.directory.ldapstudio.schemas.model.SchemaPool; -import org.apache.directory.ldapstudio.schemas.view.IImageKeys; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -59,7 +59,7 @@ super( "CreateANewSchemaWizardPage" ); //$NON-NLS-1$ setTitle( Messages.getString( "CreateANewSchemaWizardPage.Page_Title" ) ); //$NON-NLS-1$ setDescription( Messages.getString( "CreateANewSchemaWizardPage.Page_Description" ) ); //$NON-NLS-1$ - setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, IImageKeys.SCHEMA_NEW_WIZARD ) ); + setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA_NEW_WIZARD ) ); this.selection = selection; }
Mime	Unnamed text/plain (inline, 7-Bit, 87220 bytes)
	View raw message