directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r518677 [1/2] - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin: ./ ressources/icons/ src/main/java/org/apache/directory/ldapstudio/schemas/ src/main/java/org/apache/directory/ldapstudio/schemas/controller/ src/main/java/org/apache...
Date Thu, 15 Mar 2007 16:26:38 GMT
Author: pamarcelot
Date: Thu Mar 15 09:26:30 2007
New Revision: 518677

URL: http://svn.apache.org/viewvc?view=rev&rev=518677
Log:
Renamed Hierarchy View to Schema Elements View.
Added a new icon.

Added:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/schema_elements_view.png
      - copied, changed from r515989, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/hierarchy_view.png
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java
      - copied, changed from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java
      - copied, changed from r518658, 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/OpenSchemaElementsViewSortDialogAction.java
      - copied, changed from r515989, 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/OpencSchemaElementsViewPreferencesAction.java
      - copied, changed from r515989, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewPreferencesAction.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaElementsViewPreferencePage.java
      - copied, changed from r515989, 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/viewers/SchemaElementsContentProvider.java
      - copied, changed from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsView.java
      - copied, changed from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsViewLabelProvider.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemasElementsSortDialog.java
      - copied, changed from r515989, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewSortDialog.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/SchemaElementsViewRoot.java
      - copied, changed from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/HierarchyViewRoot.java
Removed:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewPreferencesAction.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/view/preferences/HierarchyViewPreferencePage.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.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/HierarchyViewSortDialog.java
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/wrappers/HierarchyViewRoot.java
Modified:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/PluginConstants.java
    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/view/perspectives/Perspective.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/SchemasViewSortDialog.java

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties?view=diff&rev=518677&r1=518676&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.properties Thu Mar 15 09:26:30 2007
@@ -25,7 +25,7 @@
 ldapstudio-schemas-plugin.perspective.schemas.name=Schemas
 
 ldapstudio-schemas-plugin.views.category.name=Schemas Editor
-ldapstudio-schemas-plugin.views.hierarchy.name=Hierarchy
+ldapstudio-schemas-plugin.views.schemaElements.name=Schema Elements
 ldapstudio-schemas-plugin.views.schemas.name=Schemas
 ldapstudio-schemas-plugin.views.search.name=Search
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml?view=diff&rev=518677&r1=518676&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml Thu Mar 15 09:26:30 2007
@@ -35,10 +35,10 @@
       <view
             allowMultiple="false"
             category="org.apache.directory.ldapstudio.schemas.view.category"
-            class="org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView"
-            icon="ressources/icons/hierarchy_view.png"
-            id="org.apache.directory.ldapstudio.schemas.view.HierarchyView"
-            name="%ldapstudio-schemas-plugin.views.hierarchy.name"/>
+            class="org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView"
+            icon="ressources/icons/schema_elements_view.png"
+            id="org.apache.directory.ldapstudio.schemas.view.SchemaElementsView"
+            name="%ldapstudio-schemas-plugin.views.schemaElements.name"/>
       <view
             category="org.apache.directory.ldapstudio.schemas.view.category"
             class="org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView"
@@ -175,9 +175,9 @@
             name="%ldapstudio-schemas-plugin.preferencepages.general.name"/>
       <page
             category="org.apache.directory.ldapstudio.schemas.preferences.general"
-            class="org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage"
-            id="org.apache.directory.ldapstudio.schemas.preferences.hierarchyView"
-            name="Hierarchy View"/>
+            class="org.apache.directory.ldapstudio.schemas.view.preferences.SchemaElementsViewPreferencePage"
+            id="org.apache.directory.ldapstudio.schemas.preferences.schemaElementsView"
+            name="Schema Elements View"/>
       <page
             category="org.apache.directory.ldapstudio.schemas.preferences.general"
             class="org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage"

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/schema_elements_view.png (from r515989, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/hierarchy_view.png)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/schema_elements_view.png?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/hierarchy_view.png&r1=515989&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/ressources/icons/schema_elements_view.png&r2=518677
==============================================================================
Binary files - no diff available.

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/PluginConstants.java?view=diff&rev=518677&r1=518676&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/PluginConstants.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/PluginConstants.java Thu Mar 15 09:26:30 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.ldapstudio.schemas;
 
 
-import org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaElementsViewPreferencePage;
 import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage;
 
 
@@ -33,74 +33,74 @@
  */
 public interface PluginConstants
 {
-    // Preferences - Hierarchy View
-    /** The preference ID for Hierarchy View Label */
-    public static final String PREFS_HIERARCHY_VIEW_LABEL = HierarchyViewPreferencePage.ID + ".label.labelValue"; //$NON-NLS-1$
+    // Preferences - Schema Elements View
+    /** The preference ID for Schema Elements View Label */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_LABEL = SchemaElementsViewPreferencePage.ID + ".label.labelValue"; //$NON-NLS-1$
 
-    /** The preference value for Hierarchy View First Name label */
-    public static final int PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME = 0;
+    /** The preference value for Schema Elements View First Name label */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME = 0;
 
-    /** The preference value for Hierarchy View All Aliases label */
-    public static final int PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES = 1;
+    /** The preference value for Schema Elements View All Aliases label */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES = 1;
 
-    /** The preference value for Hierarchy View OID label */
-    public static final int PREFS_HIERARCHY_VIEW_LABEL_OID = 2;
+    /** The preference value for Schema Elements View OID label */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID = 2;
 
-    /** The preference ID for Hierarchy View Abbreviate */
-    public static final String PREFS_HIERARCHY_VIEW_ABBREVIATE = HierarchyViewPreferencePage.ID + ".label.abbreviate"; //$NON-NLS-1$
+    /** The preference ID for Schema Elements View Abbreviate */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE = SchemaElementsViewPreferencePage.ID + ".label.abbreviate"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Abbreviate Max Length*/
-    public static final String PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH = HierarchyViewPreferencePage.ID
+    /** The preference ID for Schema Elements View Abbreviate Max Length*/
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH = SchemaElementsViewPreferencePage.ID
         + ".label.abbreviate.maxLength"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Display Secondary Label */
-    public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY = HierarchyViewPreferencePage.ID
+    /** The preference ID for Schema Elements View Display Secondary Label */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY = SchemaElementsViewPreferencePage.ID
         + ".secondaryLabel.display"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Secondary Label */
-    public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL = HierarchyViewPreferencePage.ID
+    /** The preference ID for Schema Elements View Secondary Label */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL = SchemaElementsViewPreferencePage.ID
         + ".secondaryLabel.labelValue"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Abbreviate Secondary Label */
-    public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE = HierarchyViewPreferencePage.ID
+    /** The preference ID for Schema Elements View Abbreviate Secondary Label */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE = SchemaElementsViewPreferencePage.ID
         + ".secondaryLabel.abbreviate"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Abbreviate Secondary Label Max Length*/
-    public static final String PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH = HierarchyViewPreferencePage.ID
+    /** The preference ID for Schema Elements View Abbreviate Secondary Label Max Length*/
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH = SchemaElementsViewPreferencePage.ID
         + ".secondaryLabel.abbreviate.maxLength"; //$NON-NLS-1$
 
-    /** The preference ID for Hierarchy View Grouping */
-    public static final String PREFS_HIERARCHY_VIEW_GROUPING = Activator.PLUGIN_ID
-        + ".preferences.HierarchyView.grouping";
+    /** The preference ID for Schema Elements View Grouping */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING = Activator.PLUGIN_ID
+        + ".preferences.SchemaElementsView.grouping";
 
-    /** The preference value for Hierarchy View Grouping 'attribute types first' */
-    public static final int PREFS_HIERARCHY_VIEW_GROUPING_ATFIRST = 0;
+    /** The preference value for Schema Elements View Grouping 'attribute types first' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_ATFIRST = 0;
 
-    /** The preference value for Hierarchy View Grouping 'object classes first' */
-    public static final int PREFS_HIERARCHY_VIEW_GROUPING_OCFIRST = 1;
+    /** The preference value for Schema Elements View Grouping 'object classes first' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_OCFIRST = 1;
 
-    /** The preference value for Hierarchy View Grouping 'mixed' */
-    public static final int PREFS_HIERARCHY_VIEW_GROUPING_MIXED = 2;
+    /** The preference value for Schema Elements View Grouping 'mixed' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_MIXED = 2;
 
-    /** The preference ID for Hierarchy View Sorting By */
-    public static final String PREFS_HIERARCHY_VIEW_SORTING_BY = Activator.PLUGIN_ID
-        + ".preferences.HierarchyView.sortingBy";
+    /** The preference ID for Schema Elements View Sorting By */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY = Activator.PLUGIN_ID
+        + ".preferences.SchemaElementsView.sortingBy";
 
-    /** The preference value for Hierarchy View Sorting 'First Name' */
-    public static final int PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME = 0;
+    /** The preference value for Schema Elements View Sorting 'First Name' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME = 0;
 
-    /** The prefence value for Hierarchy View Sorting 'OID' */
-    public static final int PREFS_HIERARCHY_VIEW_SORTING_BY_OID = 1;
+    /** The prefence value for Schema Elements View Sorting 'OID' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID = 1;
 
-    /** The preference ID for Hierarchy View Sorting Order */
-    public static final String PREFS_HIERARCHY_VIEW_SORTING_ORDER = Activator.PLUGIN_ID
-        + ".preferences.HierarchyView.sortingOrder";
+    /** The preference ID for Schema Elements View Sorting Order */
+    public static final String PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER = Activator.PLUGIN_ID
+        + ".preferences.SchemaElementsView.sortingOrder";
 
-    /** The preference value for Hierarchy View Sorting 'ascending' */
-    public static final int PREFS_HIERARCHY_VIEW_SORTING_ORDER_ASCENDING = 0;
+    /** The preference value for Schema Elements View Sorting 'ascending' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_ASCENDING = 0;
 
-    /** The prefence value for Hierarchy View Sorting 'descending' */
-    public static final int PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING = 1;
+    /** The prefence value for Schema Elements View Sorting 'descending' */
+    public static final int PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING = 1;
 
     // Preferences - Schemas View
     /** The preference ID for Schemas View Label */
@@ -207,11 +207,11 @@
     public static final String CMD_ERASE_SEARCH = Activator.PLUGIN_ID + ".cmd.EraseSearch"; //$NON-NLS-1$
     public static final String CMD_HIDE_ATTRIBUTE_TYPES = Activator.PLUGIN_ID + ".cmd.HideAttributesTypes"; //$NON-NLS-1$
     public static final String CMD_HIDE_OBJECT_CLASSES = Activator.PLUGIN_ID + ".cmd.HideObjectClasses"; //$NON-NLS-1$
-    public static final String CMD_LINK_WITH_EDITOR_HIERARCHY_VIEW = Activator.PLUGIN_ID + ".cmd.LinkWithEditorHierarchyView"; //$NON-NLS-1$
+    public static final String CMD_LINK_WITH_EDITOR_SCHEMA_ELEMENTS_VIEW = Activator.PLUGIN_ID + ".cmd.LinkWithEditorSchemaElementsView"; //$NON-NLS-1$
     public static final String CMD_LINK_WITH_EDITOR_SCHEMA_VIEW = Activator.PLUGIN_ID + ".cmd.LinkWithEditorSchemasView"; //$NON-NLS-1$
     public static final String CMD_OPEN_LOCAL = Activator.PLUGIN_ID + ".cmd.OpenLocal"; //$NON-NLS-1$
-    public static final String CMD_HIERARCHY_VIEW_PREFERENCES = Activator.PLUGIN_ID + ".cmd.OpenHierarchyViewPreferences"; //$NON-NLS-1$
-    public static final String CMD_HIERARCHY_VIEW_SORT_DIALOG = Activator.PLUGIN_ID + ".cmd.OpenHierarchyViewSortDialog"; //$NON-NLS-1$
+    public static final String CMD_SCHEMA_ELEMENTS_VIEW_PREFERENCES = Activator.PLUGIN_ID + ".cmd.OpenSchemaElementsViewPreferences"; //$NON-NLS-1$
+    public static final String CMD_SCHEMA_ELEMENTS_VIEW_SORT_DIALOG = Activator.PLUGIN_ID + ".cmd.OpenSchemaElementsViewSortDialog"; //$NON-NLS-1$
     public static final String CMD_OPEN_SCHEMA_SOURCE_CODE = Activator.PLUGIN_ID + ".cmd.OpenSchemaSourceSode"; //$NON-NLS-1$
     public static final String CMD_SCHEMAS_VIEW_PREFERENCES = Activator.PLUGIN_ID + ".cmd.OpenSchemasViewPreferences"; //$NON-NLS-1$
     public static final String CMD_SCHEMAS_VIEW_SORT_DIALOG = Activator.PLUGIN_ID + ".cmd.OpenSchemasViewSortDialog"; //$NON-NLS-1$

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=518677&r1=518676&r2=518677
==============================================================================
--- 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 Thu Mar 15 09:26:30 2007
@@ -53,24 +53,24 @@
 
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 
-        // Hierarchy View Preference Page
-        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" );
+        // Schema Elements View Preference Page
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL,
+            PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE, true );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH, "50" );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY, true );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL,
+            PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE, false );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, "50" );
 
-        // Hierarchy View Sorting
-        store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING,
-            PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING_ATFIRST );
-        store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY,
-            PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME );
-        store.setDefault( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER,
-            PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_ASCENDING );
+        // Schema Elements View Sorting
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING,
+            PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_ATFIRST );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY,
+            PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME );
+        store.setDefault( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER,
+            PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_ASCENDING );
 
         // Schemas View Preference Page
         store.setDefault( PluginConstants.PREFS_SCHEMAS_VIEW_LABEL,

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java (from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java&r1=518658&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/HierarchyViewController.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/SchemaElementsController.java Thu Mar 15 09:26:30 2007
@@ -29,14 +29,14 @@
 import org.apache.directory.ldapstudio.schemas.controller.actions.CollapseAllAction;
 import org.apache.directory.ldapstudio.schemas.controller.actions.HideAttributeTypesAction;
 import org.apache.directory.ldapstudio.schemas.controller.actions.HideObjectClassesAction;
-import org.apache.directory.ldapstudio.schemas.controller.actions.LinkWithEditorHierarchyView;
-import org.apache.directory.ldapstudio.schemas.controller.actions.OpenHierarchyViewPreferencesAction;
-import org.apache.directory.ldapstudio.schemas.controller.actions.OpenHierarchyViewSortDialogAction;
+import org.apache.directory.ldapstudio.schemas.controller.actions.LinkWithEditorSchemaElementsView;
+import org.apache.directory.ldapstudio.schemas.controller.actions.OpencSchemaElementsViewPreferencesAction;
+import org.apache.directory.ldapstudio.schemas.controller.actions.OpenSchemaElementsViewSortDialogAction;
 import org.apache.directory.ldapstudio.schemas.view.editors.AttributeTypeFormEditor;
 import org.apache.directory.ldapstudio.schemas.view.editors.AttributeTypeFormEditorInput;
 import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassFormEditor;
 import org.apache.directory.ldapstudio.schemas.view.editors.ObjectClassFormEditorInput;
-import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper;
@@ -57,35 +57,35 @@
 
 
 /**
- * This class implements the Controller for the Hierarchy View.
+ * This class implements the Controller for the Schema Elements View.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchyViewController
+public class SchemaElementsController
 {
     /** The logger */
-    private static Logger logger = Logger.getLogger( HierarchyViewController.class );
+    private static Logger logger = Logger.getLogger( SchemaElementsController.class );
     
     /** The authorized Preferences keys*/
     List<String> authorizedPrefs;
 
     /** The associated view */
-    private HierarchyView view;
+    private SchemaElementsView view;
 
     // The Actions
     private HideObjectClassesAction hideObjectClasses;
     private HideAttributeTypesAction hideAttributeTypes;
     private CollapseAllAction collapseAll;
-    private LinkWithEditorHierarchyView linkWithEditor;
-    private OpenHierarchyViewSortDialogAction openSortDialog;
-    private OpenHierarchyViewPreferencesAction openPreferencePage;
+    private LinkWithEditorSchemaElementsView linkWithEditor;
+    private OpenSchemaElementsViewSortDialogAction openSortDialog;
+    private OpencSchemaElementsViewPreferencesAction openPreferencePage;
 
 
     /**
-     * Creates a new instance of HierarchyViewController.
+     * Creates a new instance of SchemaElementsController.
      */
-    public HierarchyViewController( HierarchyView view )
+    public SchemaElementsController( SchemaElementsView view )
     {
         this.view = view;
         
@@ -101,16 +101,16 @@
     private void initAuthorizedPrefs()
     {
         authorizedPrefs = new ArrayList<String>();
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY );
-        authorizedPrefs.add( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY );
+        authorizedPrefs.add( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER );
     }
 
 
@@ -122,9 +122,9 @@
         hideObjectClasses = new HideObjectClassesAction( view.getViewer() );
         hideAttributeTypes = new HideAttributeTypesAction( view.getViewer() );
         collapseAll = new CollapseAllAction( view.getViewer() );
-        linkWithEditor = new LinkWithEditorHierarchyView( view );
-        openSortDialog = new OpenHierarchyViewSortDialogAction();
-        openPreferencePage = new OpenHierarchyViewPreferencesAction();
+        linkWithEditor = new LinkWithEditorSchemaElementsView( view );
+        openSortDialog = new OpenSchemaElementsViewSortDialogAction();
+        openPreferencePage = new OpencSchemaElementsViewPreferencesAction();
     }
 
 
@@ -167,8 +167,8 @@
             {
                 IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 
-                HierarchyView view = ( HierarchyView ) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
-                    .getActivePage().findView( HierarchyView.ID );
+                SchemaElementsView view = ( SchemaElementsView ) PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+                    .getActivePage().findView( SchemaElementsView.ID );
                 TreeViewer viewer = view.getViewer();
 
                 // What we get from the treeViewer is a StructuredSelection
@@ -229,7 +229,7 @@
             { 
                 if ( authorizedPrefs.contains( event.getProperty() ) )
                 {
-                    if ( PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING == event.getProperty() )
+                    if ( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING == event.getProperty() )
                     {
                         view.completeRefresh();
                     }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java (from r518658, 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/LinkWithEditorSchemaElementsView.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorHierarchyView.java&r1=518658&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/LinkWithEditorSchemaElementsView.java&r2=518677
==============================================================================
--- 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/LinkWithEditorSchemaElementsView.java Thu Mar 15 09:26:30 2007
@@ -28,7 +28,7 @@
 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;
-import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ITreeNode;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.IntermediateNode;
@@ -54,14 +54,14 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class LinkWithEditorHierarchyView extends Action
+public class LinkWithEditorSchemaElementsView extends Action
 {
     /** The String for storing the checked state of the action */
-    private static final String LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY = LinkWithEditorHierarchyView.class.getName()
+    private static final String LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY = LinkWithEditorSchemaElementsView.class.getName()
         + ".dialogsettingkey";
 
     /** The associated view */
-    private HierarchyView hierarchyView;
+    private SchemaElementsView view;
     
     /** The Schema Pool */
     private SchemaPool schemaPool;
@@ -78,9 +78,9 @@
 
             if ( ( id.equals( ObjectClassFormEditor.ID ) || ( id.equals( AttributeTypeFormEditor.ID ) ) ) )
             {
-                hierarchyView.getSite().getPage().removePostSelectionListener( viewListener );
+                view.getSite().getPage().removePostSelectionListener( viewListener );
                 linkViewWithEditor( partRef.getPartName(), id );
-                hierarchyView.getSite().getPage().addPostSelectionListener( viewListener );
+                view.getSite().getPage().addPostSelectionListener( viewListener );
             }
         }
 
@@ -163,20 +163,20 @@
 
 
     /**
-     * Creates a new instance of LinkWithEditorHierarchyView.
+     * Creates a new instance of LinkWithEditorSchemaElementsView.
      *
      * @param view
      *      the associated view
      */
-    public LinkWithEditorHierarchyView( HierarchyView view )
+    public LinkWithEditorSchemaElementsView( SchemaElementsView view )
     {
         super( "Link with Editor", AS_CHECK_BOX );
         setToolTipText( getText() );
-        setId( PluginConstants.CMD_LINK_WITH_EDITOR_HIERARCHY_VIEW );
+        setId( PluginConstants.CMD_LINK_WITH_EDITOR_SCHEMA_ELEMENTS_VIEW );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_LINK_WITH_EDITOR ) );
         setEnabled( true );
-        hierarchyView = view;
+        this.view = view;
         schemaPool = SchemaPool.getInstance();
 
         // Setting up the default key value (if needed)
@@ -192,7 +192,7 @@
         if ( isChecked() )
         {
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener( editorListener );
-            hierarchyView.getSite().getPage().addPostSelectionListener( viewListener );
+            view.getSite().getPage().addPostSelectionListener( viewListener );
         }
     }
 
@@ -222,13 +222,13 @@
                 linkViewWithEditor( editor.getPartName(), AttributeTypeFormEditor.ID );
             }
 
-            hierarchyView.getSite().getPage().addPostSelectionListener( viewListener );
+            view.getSite().getPage().addPostSelectionListener( viewListener );
         }
         else
         // Disabling the listeners
         {
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().removePartListener( editorListener );
-            hierarchyView.getSite().getPage().removePostSelectionListener( viewListener );
+            view.getSite().getPage().removePostSelectionListener( viewListener );
         }
     }
 
@@ -253,7 +253,7 @@
             wrapper = new AttributeTypeWrapper( at, null );
             structuredSelection = new StructuredSelection( wrapper );
 
-            hierarchyView.getViewer().setSelection( structuredSelection, true );
+            view.getViewer().setSelection( structuredSelection, true );
         }
         else if ( editorID.equals( ObjectClassFormEditor.ID ) )
         {
@@ -267,20 +267,20 @@
             return;
         }
 
-        Object foundItem = hierarchyView.getViewer().testFindItem( wrapper );
+        Object foundItem = view.getViewer().testFindItem( wrapper );
         if ( foundItem != null ) // The node we are looking for is already loaded in the TreeViewer
         {
-            hierarchyView.getViewer().setSelection( structuredSelection, true );
+            view.getViewer().setSelection( structuredSelection, true );
         }
         else
         // The node we are looking for is not yet loaded in the TreeViewer, we have to find and load it.
         {
-            ITreeNode foundElement = hierarchyView.findElementInTree( wrapper );
+            ITreeNode foundElement = view.findElementInTree( wrapper );
 
             if ( foundElement != null )
             {
                 expandFromTopToBottom( foundElement );
-                hierarchyView.getViewer().setSelection( structuredSelection );
+                view.getViewer().setSelection( structuredSelection );
             }
         }
     }
@@ -297,28 +297,28 @@
         if ( element instanceof SchemaWrapper )
         {
             SchemaWrapper schemaWrapper = ( SchemaWrapper ) element;
-            if ( !hierarchyView.getViewer().getExpandedState( schemaWrapper ) )
+            if ( !view.getViewer().getExpandedState( schemaWrapper ) )
             {
-                hierarchyView.getViewer().setExpandedState( schemaWrapper, true );
+                view.getViewer().setExpandedState( schemaWrapper, true );
             }
         }
         else if ( element instanceof ObjectClassWrapper )
         {
             ObjectClassWrapper objectClassWrapper = ( ObjectClassWrapper ) element;
             expandFromTopToBottom( objectClassWrapper.getParent() );
-            hierarchyView.getViewer().setExpandedState( objectClassWrapper, true );
+            view.getViewer().setExpandedState( objectClassWrapper, true );
         }
         else if ( element instanceof AttributeTypeWrapper )
         {
             AttributeTypeWrapper attributeTypeWrapper = ( AttributeTypeWrapper ) element;
             expandFromTopToBottom( attributeTypeWrapper.getParent() );
-            hierarchyView.getViewer().setExpandedState( attributeTypeWrapper, true );
+            view.getViewer().setExpandedState( attributeTypeWrapper, true );
         }
         else if ( element instanceof IntermediateNode )
         {
             IntermediateNode intermediateNode = ( IntermediateNode ) element;
             expandFromTopToBottom( intermediateNode.getParent() );
-            hierarchyView.getViewer().setExpandedState( intermediateNode, true );
+            view.getViewer().setExpandedState( intermediateNode, true );
         }
     }
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaElementsViewSortDialogAction.java (from r515989, 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/OpenSchemaElementsViewSortDialogAction.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewSortDialogAction.java&r1=515989&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemaElementsViewSortDialogAction.java&r2=518677
==============================================================================
--- 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/OpenSchemaElementsViewSortDialogAction.java Thu Mar 15 09:26:30 2007
@@ -23,19 +23,19 @@
 
 import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.PluginConstants;
-import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyViewSortDialog;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasElementsSortDialog;
 import org.eclipse.jface.action.Action;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
 
 /**
- * This action opens the Sort Dialog of the Hierarchy View.
+ * This action opens the Sort Dialog of the Schema Elements View.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class OpenHierarchyViewSortDialogAction extends Action
+public class OpenSchemaElementsViewSortDialogAction extends Action
 {
 
     /**
@@ -44,11 +44,11 @@
      * @param view
      *      the associated view
      */
-    public OpenHierarchyViewSortDialogAction()
+    public OpenSchemaElementsViewSortDialogAction()
     {
         super( "Sorting..." );
         setToolTipText( getText() );
-        setId( PluginConstants.CMD_HIERARCHY_VIEW_SORT_DIALOG );
+        setId( PluginConstants.CMD_SCHEMA_ELEMENTS_VIEW_SORT_DIALOG );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SORT ) );
         setEnabled( true );
     }
@@ -59,7 +59,7 @@
      */
     public void run()
     {
-        HierarchyViewSortDialog hvsd = new HierarchyViewSortDialog( PlatformUI.getWorkbench().getDisplay()
+        SchemasElementsSortDialog hvsd = new SchemasElementsSortDialog( PlatformUI.getWorkbench().getDisplay()
             .getActiveShell() );
         hvsd.open();
     }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpencSchemaElementsViewPreferencesAction.java (from r515989, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewPreferencesAction.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpencSchemaElementsViewPreferencesAction.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewPreferencesAction.java&r1=515989&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpencSchemaElementsViewPreferencesAction.java&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenHierarchyViewPreferencesAction.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpencSchemaElementsViewPreferencesAction.java Thu Mar 15 09:26:30 2007
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.ldapstudio.schemas.PluginConstants;
-import org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage;
+import org.apache.directory.ldapstudio.schemas.view.preferences.SchemaElementsViewPreferencePage;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
@@ -35,16 +35,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class OpenHierarchyViewPreferencesAction extends Action
+public class OpencSchemaElementsViewPreferencesAction extends Action
 {
     /**
-     * Creates a new instance of OpenHierarchyViewPreferencesAction.
+     * Creates a new instance of OpencSchemaElementsViewPreferencesAction.
      */
-    public OpenHierarchyViewPreferencesAction()
+    public OpencSchemaElementsViewPreferencesAction()
     {
         super( "Preferences..." );
         setToolTipText( getText() );
-        setId( PluginConstants.CMD_HIERARCHY_VIEW_PREFERENCES );
+        setId( PluginConstants.CMD_SCHEMA_ELEMENTS_VIEW_PREFERENCES );
         setEnabled( true );
     }
 
@@ -55,7 +55,7 @@
     public void run()
     {
         Shell shell = Display.getCurrent().getActiveShell();
-        PreferencesUtil.createPreferenceDialogOn( shell, HierarchyViewPreferencePage.ID, new String[]
-            { HierarchyViewPreferencePage.ID }, null ).open();
+        PreferencesUtil.createPreferenceDialogOn( shell, SchemaElementsViewPreferencePage.ID, new String[]
+            { SchemaElementsViewPreferencePage.ID }, null ).open();
     }
 }

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java?view=diff&rev=518677&r1=518676&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/perspectives/Perspective.java Thu Mar 15 09:26:30 2007
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.ldapstudio.schemas.Activator;
-import org.apache.directory.ldapstudio.schemas.view.viewers.HierarchyView;
+import org.apache.directory.ldapstudio.schemas.view.viewers.SchemaElementsView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SearchView;
 import org.eclipse.ui.IPageLayout;
@@ -30,7 +30,7 @@
 
 
 /**
- * This is the standard perspective with Hierarchy View on the top left, Schemas View on bottom left,
+ * This is the standard perspective with Schema Elements View on the top left, Schemas View on bottom left,
  * editor in top right, Search View on bottom right.
  *
  */
@@ -44,10 +44,10 @@
         String editorArea = layout.getEditorArea();
         layout.setEditorAreaVisible( true );
 
-        layout.addStandaloneView( HierarchyView.ID, true, IPageLayout.LEFT, 0.3f, editorArea );
-        layout.getViewLayout( HierarchyView.ID ).setCloseable( false );
+        layout.addStandaloneView( SchemaElementsView.ID, true, IPageLayout.LEFT, 0.3f, editorArea );
+        layout.getViewLayout( SchemaElementsView.ID ).setCloseable( false );
 
-        layout.addStandaloneView( SchemasView.ID, true, IPageLayout.BOTTOM, 0.5f, HierarchyView.ID );
+        layout.addStandaloneView( SchemasView.ID, true, IPageLayout.BOTTOM, 0.5f, SchemaElementsView.ID );
         layout.getViewLayout( SchemasView.ID ).setCloseable( false );
 
         layout.addStandaloneView( SearchView.ID, true, IPageLayout.BOTTOM, 0.7f, editorArea );
@@ -57,7 +57,7 @@
         layout.addPerspectiveShortcut( Perspective.ID );
 
         // Adding View shortcuts
-        layout.addShowViewShortcut( HierarchyView.ID );
+        layout.addShowViewShortcut( SchemaElementsView.ID );
         layout.addShowViewShortcut( SchemasView.ID );
         layout.addShowViewShortcut( SearchView.ID );
     }

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaElementsViewPreferencePage.java (from r515989, 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/SchemaElementsViewPreferencePage.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/HierarchyViewPreferencePage.java&r1=515989&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/preferences/SchemaElementsViewPreferencePage.java&r2=518677
==============================================================================
--- 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/SchemaElementsViewPreferencePage.java Thu Mar 15 09:26:30 2007
@@ -44,15 +44,15 @@
 
 
 /**
- * This class implements the Preference page for the Hierarchy View
+ * This class implements the Preference page for the Schema Elements View
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchyViewPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
+public class SchemaElementsViewPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
 {
     /** The preference page ID */
-    public static final String ID = Activator.PLUGIN_ID + ".preferences.hierarchyView";
+    public static final String ID = Activator.PLUGIN_ID + ".preferences.schemaElementsView";
 
     /** The First Name category */
     private static final String FIRST_NAME = "First Name";
@@ -74,13 +74,13 @@
 
 
     /**
-     * Creates a new instance of HierarchyViewPreferencePage.
+     * Creates a new instance of SchemaElementsViewPreferencePage.
      */
-    public HierarchyViewPreferencePage()
+    public SchemaElementsViewPreferencePage()
     {
         super();
         super.setPreferenceStore( Activator.getDefault().getPreferenceStore() );
-        super.setDescription( "General settings for the Schemas Editor Hierarchy View" );
+        super.setDescription( "General settings for the Schema Elements View of the Schemas Editor Plugin" );
     }
 
 
@@ -271,17 +271,17 @@
     {
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 
-        labelCombo.select( store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ) );
-        limitButton.setSelection( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ) );
+        labelCombo.select( store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL ) );
+        limitButton.setSelection( store.getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE ) );
         lengthText.setEnabled( limitButton.getSelection() );
-        lengthText.setText( store.getString( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) );
+        lengthText.setText( store.getString( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH ) );
 
-        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 ) );
+        secondaryLabelButtonDisplay.setSelection( store.getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY ) );
+        secondaryLabelCombo.select( store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL ) );
+        secondaryLabelLimitButton.setSelection( store.getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE ) );
         secondaryLabelLengthText
-            .setText( store.getString( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) );
-        if ( store.getBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) )
+            .setText( store.getString( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) );
+        if ( store.getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY ) )
         {
             secondaryLabelCombo.setEnabled( true );
             secondaryLabelLimitButton.setEnabled( true );
@@ -345,18 +345,18 @@
     {
         IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 
-        labelCombo.select( store.getDefaultInt( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL ) );
-        limitButton.setSelection( store.getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE ) );
+        labelCombo.select( store.getDefaultInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL ) );
+        limitButton.setSelection( store.getDefaultBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE ) );
         lengthText.setEnabled( limitButton.getSelection() );
-        lengthText.setText( store.getDefaultString( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH ) );
+        lengthText.setText( store.getDefaultString( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH ) );
 
         secondaryLabelButtonDisplay.setSelection( store
-            .getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY ) );
-        secondaryLabelCombo.select( store.getDefaultInt( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL ) );
+            .getDefaultBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY ) );
+        secondaryLabelCombo.select( store.getDefaultInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL ) );
         secondaryLabelLimitButton.setSelection( store
-            .getDefaultBoolean( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE ) );
+            .getDefaultBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE ) );
         secondaryLabelLengthText.setText( store
-            .getDefaultString( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) );
+            .getDefaultString( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH ) );
 
         if ( secondaryLabelButtonDisplay.getSelection() )
         {
@@ -384,34 +384,34 @@
 
         if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( FIRST_NAME ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME );
         }
         else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( ALL_ALIASES ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES );
         }
         else if ( labelCombo.getItem( labelCombo.getSelectionIndex() ).equals( OID ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID );
         }
-        store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE, limitButton.getSelection() );
-        store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() );
+        store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE, limitButton.getSelection() );
+        store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH, lengthText.getText() );
 
-        store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_DISPLAY, secondaryLabelButtonDisplay.getSelection() );
+        store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY, secondaryLabelButtonDisplay.getSelection() );
         if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( FIRST_NAME ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME );
         }
         else if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( ALL_ALIASES ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES );
         }
         else if ( secondaryLabelCombo.getItem( secondaryLabelCombo.getSelectionIndex() ).equals( OID ) )
         {
-            store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID );
+            store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL, PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID );
         }
-        store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE, secondaryLabelLimitButton.getSelection() );
-        store.setValue( PluginConstants.PREFS_HIERARCHY_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH, secondaryLabelLengthText.getText() );
+        store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE, secondaryLabelLimitButton.getSelection() );
+        store.setValue( PluginConstants.PREFS_SCHEMA_ELEMENTS_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=518677&r1=518676&r2=518677
==============================================================================
--- 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 Thu Mar 15 09:26:30 2007
@@ -70,13 +70,13 @@
 
 
     /**
-     * Creates a new instance of HierarchyViewPreferencePage.
+     * Creates a new instance of SchemasViewPreferencePage.
      */
     public SchemasViewPreferencePage()
     {
         super();
         super.setPreferenceStore( Activator.getDefault().getPreferenceStore() );
-        super.setDescription( "General settings for the Schemas Editor Schemas View" );
+        super.setDescription( "General settings for the Schemas View of the Schemas Editor Plugin" );
     }
 
 

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsContentProvider.java (from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsContentProvider.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java&r1=518658&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsContentProvider.java&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyViewContentProvider.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsContentProvider.java Thu Mar 15 09:26:30 2007
@@ -47,12 +47,12 @@
 
 
 /**
- * This class implements the content provider for the Hierarchy View.
+ * This class implements the content provider for the Schema Elements View.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchyViewContentProvider implements IStructuredContentProvider, ITreeContentProvider
+public class SchemaElementsContentProvider implements IStructuredContentProvider, ITreeContentProvider
 {
     /** The Schema Pool holding all schemas */
     private SchemaPool schemaPool;
@@ -74,12 +74,12 @@
 
 
     /**
-     * Creates a new instance of HierarchyViewContentProvider.
+     * Creates a new instance of SchemaElementsContentProvider.
      *
      * @param schemaPool
      *      the associated Schema Pool
      */
-    public HierarchyViewContentProvider()
+    public SchemaElementsContentProvider()
     {
         this.schemaPool = SchemaPool.getInstance();
         store = Activator.getDefault().getPreferenceStore();
@@ -108,9 +108,9 @@
     {
         List<ITreeNode> children = new ArrayList<ITreeNode>();
 
-        int group = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING );
-        int sortBy = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY );
-        int sortOrder = store.getInt( PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER );
+        int group = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING );
+        int sortBy = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY );
+        int sortOrder = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER );
 
         if ( parentElement instanceof ObjectClassWrapper )
         {
@@ -142,17 +142,17 @@
             }
 
             // Sort by
-            if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME )
+            if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME )
             {
                 Collections.sort( children, firstNameSorter );
             }
-            else if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_OID )
+            else if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID )
             {
                 Collections.sort( children, oidSorter );
             }
 
             // Sort order
-            if ( sortOrder == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING )
+            if ( sortOrder == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING )
             {
                 Collections.reverse( children );
             }
@@ -187,17 +187,17 @@
             }
 
             // Sort by
-            if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME )
+            if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME )
             {
                 Collections.sort( children, firstNameSorter );
             }
-            else if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_OID )
+            else if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID )
             {
                 Collections.sort( children, oidSorter );
             }
 
             // Sort order
-            if ( sortOrder == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING )
+            if ( sortOrder == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING )
             {
                 Collections.reverse( children );
             }
@@ -259,22 +259,22 @@
                     }
                 }
 
-                if ( group == PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING_ATFIRST )
+                if ( group == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_ATFIRST )
                 {
                     // Sort by
-                    if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME )
+                    if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME )
                     {
                         Collections.sort( atList, firstNameSorter );
                         Collections.sort( ocList, firstNameSorter );
                     }
-                    else if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_OID )
+                    else if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID )
                     {
                         Collections.sort( atList, oidSorter );
                         Collections.sort( ocList, oidSorter );
                     }
 
                     // Sort Order
-                    if ( sortOrder == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING )
+                    if ( sortOrder == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING )
                     {
                         Collections.reverse( atList );
                         Collections.reverse( ocList );
@@ -284,22 +284,22 @@
                     children.addAll( atList );
                     children.addAll( ocList );
                 }
-                else if ( group == PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING_OCFIRST )
+                else if ( group == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_OCFIRST )
                 {
                     // Sort by
-                    if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME )
+                    if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME )
                     {
                         Collections.sort( atList, firstNameSorter );
                         Collections.sort( ocList, firstNameSorter );
                     }
-                    else if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_OID )
+                    else if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID )
                     {
                         Collections.sort( atList, oidSorter );
                         Collections.sort( ocList, oidSorter );
                     }
 
                     // Sort Order
-                    if ( sortOrder == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING )
+                    if ( sortOrder == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING )
                     {
                         Collections.reverse( atList );
                         Collections.reverse( ocList );
@@ -309,24 +309,24 @@
                     children.addAll( ocList );
                     children.addAll( atList );
                 }
-                else if ( group == PluginConstants.PREFS_HIERARCHY_VIEW_GROUPING_MIXED )
+                else if ( group == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_GROUPING_MIXED )
                 {
                     // Group
                     children.addAll( atList );
                     children.addAll( ocList );
 
                     // Sort by
-                    if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_FIRSTNAME )
+                    if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_FIRSTNAME )
                     {
                         Collections.sort( children, firstNameSorter );
                     }
-                    else if ( sortBy == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_BY_OID )
+                    else if ( sortBy == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_BY_OID )
                     {
                         Collections.sort( children, oidSorter );
                     }
 
                     // Sort order
-                    if ( sortOrder == PluginConstants.PREFS_HIERARCHY_VIEW_SORTING_ORDER_DESCENDING )
+                    if ( sortOrder == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SORTING_ORDER_DESCENDING )
                     {
                         Collections.reverse( children );
                     }
@@ -392,7 +392,7 @@
     public void bindToTreeViewer( TreeViewer viewer )
     {
         viewer.setContentProvider( this );
-        viewer.setLabelProvider( new DecoratingLabelProvider( new HierarchyViewLabelProvider(), Activator.getDefault()
+        viewer.setLabelProvider( new DecoratingLabelProvider( new SchemaElementsViewLabelProvider(), Activator.getDefault()
             .getWorkbench().getDecoratorManager().getLabelDecorator() ) );
 
         IntermediateNode invisibleNode = new IntermediateNode( "**Primary Node**", null ); //$NON-NLS-1$

Copied: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsView.java (from r518658, directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java)
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsView.java?view=diff&rev=518677&p1=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java&r1=518658&p2=directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsView.java&r2=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/HierarchyView.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsView.java Thu Mar 15 09:26:30 2007
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.ldapstudio.schemas.Activator;
-import org.apache.directory.ldapstudio.schemas.controller.HierarchyViewController;
+import org.apache.directory.ldapstudio.schemas.controller.SchemaElementsController;
 import org.apache.directory.ldapstudio.schemas.model.LDAPModelEvent;
 import org.apache.directory.ldapstudio.schemas.model.PoolListener;
 import org.apache.directory.ldapstudio.schemas.model.SchemaPool;
@@ -35,21 +35,21 @@
 
 
 /**
- * This class implements the Hierarchy View where all the hierarchy of object classes and attribute types is displayed.
+ * This class implements the Schema Elements View where all the object classes and attribute types are displayed.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class HierarchyView extends ViewPart implements PoolListener
+public class SchemaElementsView extends ViewPart implements PoolListener
 {
     /** The view's ID */
-    public static final String ID = Activator.PLUGIN_ID + ".view.HierarchyView"; //$NON-NLS-1$
+    public static final String ID = Activator.PLUGIN_ID + ".view.SchemaElementsView"; //$NON-NLS-1$
 
     /** The tree viewer */
     private TreeViewer viewer;
 
     /** The content provider */
-    private HierarchyViewContentProvider contentProvider;
+    private SchemaElementsContentProvider contentProvider;
 
 
     /* (non-Javadoc)
@@ -67,7 +67,7 @@
         pool.addListener( this );
 
         // Adding the controller
-        new HierarchyViewController( this );
+        new SchemaElementsController( this );
     }
 
 
@@ -80,7 +80,7 @@
     private void initViewer( Composite parent )
     {
         viewer = new TreeViewer( parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
-        contentProvider = new HierarchyViewContentProvider();
+        contentProvider = new SchemaElementsContentProvider();
         contentProvider.bindToTreeViewer( viewer );
     }
 

Added: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsViewLabelProvider.java?view=auto&rev=518677
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsViewLabelProvider.java (added)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/view/viewers/SchemaElementsViewLabelProvider.java Thu Mar 15 09:26:30 2007
@@ -0,0 +1,207 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+
+package org.apache.directory.ldapstudio.schemas.view.viewers;
+
+
+import org.apache.directory.ldapstudio.schemas.Activator;
+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.ITreeNode;
+import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.ObjectClassWrapper;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+
+/**
+ * This class implements the label provider for the Schema Elements View.
+ * 
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class SchemaElementsViewLabelProvider extends LabelProvider
+{
+    /** The preferences store */
+    private IPreferenceStore store;
+
+
+    /**
+     * Creates a new instance of SchemaElementsViewLabelProvider.
+     */
+    public SchemaElementsViewLabelProvider()
+    {
+        store = Activator.getDefault().getPreferenceStore();
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
+     */
+    public String getText( Object obj )
+    {
+        String label = "";
+
+        int labelValue = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL );
+        boolean abbreviate = store.getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE );
+        int abbreviateMaxLength = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_ABBREVIATE_MAX_LENGTH );
+        boolean secondaryLabelDisplay = store
+            .getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_DISPLAY );
+        int secondaryLabelValue = store.getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL );
+        boolean secondaryLabelAbbreviate = store
+            .getBoolean( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE );
+        int secondaryLabelAbbreviateMaxLength = store
+            .getInt( PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH );
+
+        if ( obj instanceof AttributeTypeWrapper )
+        {
+            if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME )
+            {
+                label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0];
+            }
+            else if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES )
+            {
+                label = concateNames( ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames() );
+            }
+            else if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID )
+            {
+                label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getOid();
+            }
+            else
+            // Default
+            {
+                label = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0];
+            }
+        }
+        else if ( obj instanceof ObjectClassWrapper )
+        {
+            if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME )
+            {
+                label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0];
+            }
+            else if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES )
+            {
+                label = concateNames( ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames() );
+            }
+            else if ( labelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID )
+            {
+                label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getOid();
+            }
+            else
+            // Default
+            {
+                label = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0];
+            }
+        }
+        else
+        // Default
+        {
+            label = obj.toString();
+        }
+
+        if ( abbreviate && ( abbreviateMaxLength < label.length() ) )
+        {
+            label = label.substring( 0, abbreviateMaxLength ) + "...";
+        }
+
+        if ( secondaryLabelDisplay )
+        {
+            String secondaryLabel = "";
+            if ( obj instanceof AttributeTypeWrapper )
+            {
+                if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME )
+                {
+                    secondaryLabel = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames()[0];
+                }
+                else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES )
+                {
+                    secondaryLabel = concateNames( ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getNames() );
+                }
+                else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID )
+                {
+                    secondaryLabel = ( ( AttributeTypeWrapper ) obj ).getMyAttributeType().getOid();
+                }
+            }
+            else if ( obj instanceof ObjectClassWrapper )
+            {
+                if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_FIRST_NAME )
+                {
+                    secondaryLabel = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames()[0];
+                }
+                else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_ALL_ALIASES )
+                {
+                    secondaryLabel = concateNames( ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getNames() );
+                }
+                else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_ELEMENTS_VIEW_LABEL_OID )
+                {
+                    secondaryLabel = ( ( ObjectClassWrapper ) obj ).getMyObjectClass().getOid();
+                }
+            }
+
+            if ( secondaryLabelAbbreviate && ( secondaryLabelAbbreviateMaxLength < secondaryLabel.length() ) )
+            {
+                secondaryLabel = secondaryLabel.substring( 0, secondaryLabelAbbreviateMaxLength ) + "...";
+            }
+
+            label += "   [" + secondaryLabel + "]";
+        }
+
+        return label;
+    }
+
+
+    /**
+     * Concatenates all aliases in a String format
+     *
+     * @param aliases
+     *      the aliases to concatenate
+     * @return
+     *      a String representing all aliases
+     */
+    private String concateNames( String[] aliases )
+    {
+        StringBuffer sb = new StringBuffer();
+
+        sb.append( aliases[0] );
+
+        for ( int i = 1; i < aliases.length; i++ )
+        {
+            sb.append( ", " );
+            sb.append( aliases[i] );
+        }
+
+        return sb.toString();
+    }
+
+
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
+     */
+    public Image getImage( Object obj )
+    {
+        if ( obj instanceof ITreeNode )
+            return ( ( ITreeNode ) obj ).getImage();
+
+        // Default
+        return PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_OBJS_WARN_TSK );
+    }
+}



Mime
View raw message