directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r515541 - in /directory/ldapstudio/trunk/ldapstudio-schemas-plugin: ./ src/main/java/org/apache/directory/ldapstudio/schemas/ src/main/java/org/apache/directory/ldapstudio/schemas/controller/ src/main/java/org/apache/directory/ldapstudio/sc...
Date Wed, 07 Mar 2007 11:46:48 GMT
Author: pamarcelot
Date: Wed Mar  7 03:46:47 2007
New Revision: 515541

URL: http://svn.apache.org/viewvc?view=rev&rev=515541
Log:
Updated Actions.
Code Cleaning.
Moved Actions IDs into PluginConstants interface.

Removed:
    directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/ICommandIds.java
Modified:
    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/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/EraseSearchAction.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/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/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/OpenSchemasViewPreferencesAction.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

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=515541&r1=515540&r2=515541
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/plugin.xml Wed Mar  7 03:46:47 2007
@@ -57,53 +57,53 @@
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.openalocalschema.description"
-            id="org.apache.directory.ldapstudio.schemas.openlocal"
+            id="org.apache.directory.ldapstudio.schemas.cmd.OpenLocal"
             name="%ldapstudio-schemas-plugin.commands.openalocalschema.name">
       </command>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.saveselectedschema.description"
-            id="org.apache.directory.ldapstudio.schemas.save"
+            id="org.apache.directory.ldapstudio.schemas.cmd.Save"
             name="%ldapstudio-schemas-plugin.commands.saveselectedschema.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.saveselectedschemaas.description"
-            id="org.apache.directory.ldapstudio.schemas.saveas"
+            id="org.apache.directory.ldapstudio.schemas.cmd.SaveAs"
             name="%ldapstudio-schemas-plugin.commands.saveselectedschemaas.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.saveallschemas.description"
-            id="org.apache.directory.ldapstudio.schemas.saveall"
+            id="org.apache.directory.ldapstudio.schemas.cmd.SaveAll"
             name="%ldapstudio-schemas-plugin.commands.saveallschemas.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.removeselectedschema.description"
-            id="org.apache.directory.ldapstudio.schemas.removeschema"
+            id="org.apache.directory.ldapstudio.schemas.cmd.RemoveSchema"
             name="%ldapstudio-schemas-plugin.commands.removeselectedschema.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.viewschemasourcecode.description"
-            id="org.apache.directory.ldapstudio.schemas.openschemasourcecode"
+            id="org.apache.directory.ldapstudio.schemas.cmd.OpenSchemaSourceCode"
             name="%ldapstudio-schemas-plugin.commands.viewschemasourcecode.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.delete.description"
-            id="org.apache.directory.ldapstudio.schemas.delete"
+            id="org.apache.directory.ldapstudio.schemas.cmd.Delete"
             name="%ldapstudio-schemas-plugin.commands.delete.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.createanewschema.description"
-            id="org.apache.directory.ldapstudio.schemas.createanewschema"
+            id="org.apache.directory.ldapstudio.schemas.cmd.CreateANewSchema"
             name="%ldapstudio-schemas-plugin.commands.createanewschema.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.createanewobjectclass.description"
-            id="org.apache.directory.ldapstudio.schemas.createanewobjectclass"
+            id="org.apache.directory.ldapstudio.schemas.cmd.CreateANewObjectClass"
             name="%ldapstudio-schemas-plugin.commands.createanewobjectclass.name"/>
       <command
             categoryId="org.apache.directory.ldapstudio.schemas.category"
             description="%ldapstudio-schemas-plugin.commands.createanewattributetype.description"
-            id="org.apache.directory.ldapstudio.schemas.createanewattributetype"
+            id="org.apache.directory.ldapstudio.schemas.cmd.CreateANewAttributeType"
             name="%ldapstudio-schemas-plugin.commands.createanewattributetype.name"/>
       <category
             id="org.apache.directory.ldapstudio.schemas.category"
@@ -112,14 +112,9 @@
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="org.apache.directory.ldapstudio.schemas.openlocal"
+            commandId="org.apache.directory.ldapstudio.schemas.cmd.OpenLocal"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="CTRL+O">
-      </key>
-      <key
-            commandId="org.eclipse.ui.file.exit"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="CTRL+Q">
       </key>
    </extension>
    <extension

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -159,40 +159,62 @@
 
     // Images - Actions
     public static final String IMG_ABOUT = "ressources/icons/flag_blue.png"; //$NON-NLS-1$
-    public static final String IMG_CREATE_A_NEW_SCHEMA = "ressources/icons/schema_new.png"; //$NON-NLS-1$
-    public static final String IMG_REMOVE_SCHEMA = "ressources/icons/schema_remove.png"; //$NON-NLS-1$
-    public static final String IMG_CREATE_A_NEW_OBJECTCLASS = "ressources/icons/object_class_new.gif"; //$NON-NLS-1$
     public static final String IMG_CREATE_A_NEW_ATTRIBUTETYPE = "ressources/icons/attribute_type_new.gif"; //$NON-NLS-1$
+    public static final String IMG_CREATE_A_NEW_OBJECTCLASS = "ressources/icons/object_class_new.gif"; //$NON-NLS-1$
+    public static final String IMG_CREATE_A_NEW_SCHEMA = "ressources/icons/schema_new.png"; //$NON-NLS-1$
     public static final String IMG_DELETE = "ressources/icons/delete.gif"; //$NON-NLS-1$
+    public static final String IMG_ERASE_SEARCH = "ressources/icons/erase_search.gif"; //$NON-NLS-1$
     public static final String IMG_EXIT = "ressources/icons/stop.png"; //$NON-NLS-1$
+    public static final String IMG_HIDE_OBJECT_CLASSES = "ressources/icons/hide_object_classes.png"; //$NON-NLS-1$
+    public static final String IMG_HIDE_ATTRIBUTE_TYPES = "ressources/icons/hide_attribute_types.png"; //$NON-NLS-1$
+    public static final String IMG_LINK_WITH_EDITOR = "ressources/icons/link_with_editor.gif"; //$NON-NLS-1$
+    public static final String IMG_COLLAPSE_ALL = "ressources/icons/collapse_all.gif"; //$NON-NLS-1$
     public static final String IMG_OPEN = "ressources/icons/open.png"; //$NON-NLS-1$
+    public static final String IMG_REMOVE_SCHEMA = "ressources/icons/schema_remove.png"; //$NON-NLS-1$
     public static final String IMG_SAVE = "ressources/icons/save.gif"; //$NON-NLS-1$
     public static final String IMG_SAVE_AS = "ressources/icons/save_as.png"; //$NON-NLS-1$
     public static final String IMG_SAVE_ALL = "ressources/icons/save_all.png"; //$NON-NLS-1$
     public static final String IMG_SHOW_PREFERENCES = "ressources/icons/preferences.png"; //$NON-NLS-1$
-    public static final String IMG_LINK_WITH_EDITOR = "ressources/icons/link_with_editor.gif"; //$NON-NLS-1$
-    public static final String IMG_COLLAPSE_ALL = "ressources/icons/collapse_all.gif"; //$NON-NLS-1$
-    public static final String IMG_HIDE_OBJECT_CLASSES = "ressources/icons/hide_object_classes.png"; //$NON-NLS-1$
-    public static final String IMG_HIDE_ATTRIBUTE_TYPES = "ressources/icons/hide_attribute_types.png"; //$NON-NLS-1$
     public static final String IMG_SORT = "ressources/icons/sort.gif"; //$NON-NLS-1$
-    public static final String IMG_ERASE_SEARCH = "ressources/icons/erase_search.gif"; //$NON-NLS-1$
 
     // Images - Views
+    public static final String IMG_ATTRIBUTE_TYPE = "ressources/icons/attribute_type.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION = "ressources/icons/attribute_type_overlay_operation.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_USER_APPLICATION = "ressources/icons/attribute_type_overlay_userApplication.gif"; //$NON-NLS-1$
     public static final String IMG_FOLDER_ATTRIBUTE_TYPE = "ressources/icons/folder_at.gif"; //$NON-NLS-1$
     public static final String IMG_FOLDER_OBJECT_CLASS = "ressources/icons/folder_oc.gif"; //$NON-NLS-1$
-    public static final String IMG_ATTRIBUTE_TYPE = "ressources/icons/attribute_type.gif"; //$NON-NLS-1$
     public static final String IMG_OBJECT_CLASS = "ressources/icons/object_class.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_ABSTRACT = "ressources/icons/object_class_overlay_abstract.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_AUXILIARY = "ressources/icons/object_class_overlay_auxiliary.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_STRUCTURAL = "ressources/icons/object_class_overlay_structural.gif"; //$NON-NLS-1$
     public static final String IMG_OBJECT_CLASS_WARNING = "ressources/icons/object_class_warning.gif"; //$NON-NLS-1$
     public static final String IMG_SCHEMA = "ressources/icons/schema.gif"; //$NON-NLS-1$
     public static final String IMG_SCHEMA_CORE = "ressources/icons/schema_core.gif"; //$NON-NLS-1$
-    public static final String IMG_OBJECT_CLASS_OVERLAY_ABSTRACT = "ressources/icons/object_class_overlay_abstract.gif"; //$NON-NLS-1$
-    public static final String IMG_OBJECT_CLASS_OVERLAY_STRUCTURAL = "ressources/icons/object_class_overlay_structural.gif"; //$NON-NLS-1$
-    public static final String IMG_OBJECT_CLASS_OVERLAY_AUXILIARY = "ressources/icons/object_class_overlay_auxiliary.gif"; //$NON-NLS-1$
-    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_USER_APPLICATION = "ressources/icons/attribute_type_overlay_userApplication.gif"; //$NON-NLS-1$
-    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION = "ressources/icons/attribute_type_overlay_operation.gif"; //$NON-NLS-1$
 
     // Images - Wizards
     public static final String IMG_ATTRIBUTE_TYPE_NEW_WIZARD = "ressources/icons/attribute_type_new_wizard.png"; //$NON-NLS-1$
     public static final String IMG_OBJECT_CLASS_NEW_WIZARD = "ressources/icons/object_class_new_wizard.png"; //$NON-NLS-1$
     public static final String IMG_SCHEMA_NEW_WIZARD = "ressources/icons/schema_new_wizard.png"; //$NON-NLS-1$
+    
+    // Action IDs
+    public static final String CMD_COLLAPSE_ALL = Activator.PLUGIN_ID + ".cmd.CollapseAll"; //$NON-NLS-1$
+    public static final String CMD_CREATE_A_NEW_ATTRIBUTETYPE = Activator.PLUGIN_ID + ".cmd.CreateANewAttributeAype"; //$NON-NLS-1$
+    public static final String CMD_CREATE_A_NEW_OBJECTCLASS = Activator.PLUGIN_ID + ".cmd.CreateANewObjectClass"; //$NON-NLS-1$
+    public static final String CMD_CREATE_A_NEW_SCHEMA = Activator.PLUGIN_ID + ".cmd.CreateANewSchema"; //$NON-NLS-1$
+    public static final String CMD_DELETE = Activator.PLUGIN_ID + ".cmd.Delete"; //$NON-NLS-1$
+    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_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_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$
+    public static final String CMD_REMOVE_SCHEMA = Activator.PLUGIN_ID + ".cmd.RemoveSchema"; //$NON-NLS-1$
+    public static final String CMD_SAVE = Activator.PLUGIN_ID + ".cmd.Save"; //$NON-NLS-1$
+    public static final String CMD_SAVE_AS = Activator.PLUGIN_ID + ".cmd.SaveAs"; //$NON-NLS-1$
+    public static final String CMD_SAVE_ALL = Activator.PLUGIN_ID + ".cmd.SaveAll"; //$NON-NLS-1$
 }

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -19,14 +19,16 @@
  */
 package org.apache.directory.ldapstudio.schemas.controller.actions;
 
+
 import org.apache.directory.ldapstudio.schemas.Activator;
 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;
 
+
 /**
- * This action collapses all nodes of the viewer's tree, starting with the root.
+ * This action collapses all nodes of the viewer's tree, starting from the root.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -35,6 +37,7 @@
 {
     protected TreeViewer viewer;
 
+
     /**
      * Creates a new instance of CollapseAllAction.
      *
@@ -43,9 +46,11 @@
      */
     public CollapseAllAction( TreeViewer viewer )
     {
-        super( "Collapse All");
+        super( "Collapse All" );
         setToolTipText( getText() );
-        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_COLLAPSE_ALL )  );
+        setId( PluginConstants.CMD_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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.viewers.SchemasView;
@@ -55,13 +54,12 @@
      */
     public CreateANewAttributeTypeAction()
     {
-        setText( Messages.getString( "CreateANewAttributeTypeAction.Create_a_new_attribute_type" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_CREATE_A_NEW_ATTRIBUTETYPE );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_ATTRIBUTETYPE );
+        super( Messages.getString( "CreateANewAttributeTypeAction.Create_a_new_attribute_type" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_CREATE_A_NEW_ATTRIBUTETYPE );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_CREATE_A_NEW_ATTRIBUTETYPE ) );
+        setEnabled( true );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.viewers.SchemasView;
@@ -55,13 +54,12 @@
      */
     public CreateANewObjectClassAction()
     {
-        setText( Messages.getString( "CreateANewObjectClassAction.Create_a_new_object_class" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_CREATE_A_NEW_OBJECTCLASS );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_OBJECTCLASS );
+        super( Messages.getString( "CreateANewObjectClassAction.Create_a_new_object_class" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_CREATE_A_NEW_OBJECTCLASS );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_CREATE_A_NEW_OBJECTCLASS ) );
+        setEnabled( true );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.wizards.CreateANewSchemaWizard;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -45,13 +44,12 @@
      */
     public CreateANewSchemaAction()
     {
-        setText( Messages.getString( "CreateANewSchemaAction.Create_a_new_schema" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_CREATE_A_NEW_SCHEMA );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_CREATE_A_NEW_SCHEMA );
+        super( Messages.getString( "CreateANewSchemaAction.Create_a_new_schema" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_CREATE_A_NEW_SCHEMA );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_CREATE_A_NEW_SCHEMA ) );
+        setEnabled( true );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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;
@@ -65,13 +64,12 @@
      */
     public DeleteAction()
     {
-        setText( Messages.getString( "DeleteAction.Delete_the_selected_item" ) ); //$NON-NLS-1$
-
-        // The id is used to refer to the action in a menu or toolbar
-        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, PluginConstants.IMG_DELETE ) );
+        super( Messages.getString( "DeleteAction.Delete_the_selected_item" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_DELETE );
+        setImageDescriptor( AbstractUIPlugin
+            .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_DELETE ) );
+        setEnabled( true );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/EraseSearchAction.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/EraseSearchAction.java?view=diff&rev=515541&r1=515540&r2=515541
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/EraseSearchAction.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/EraseSearchAction.java Wed Mar  7 03:46:47 2007
@@ -19,13 +19,14 @@
  */
 package org.apache.directory.ldapstudio.schemas.controller.actions;
 
+
 import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.PluginConstants;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SearchView;
 import org.eclipse.jface.action.Action;
-import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
+
 /**
  * This action collapses all nodes of the viewer's tree, starting with the root.
  *
@@ -36,6 +37,7 @@
 {
     protected SearchView view;
 
+
     /**
      * Creates a new instance of CollapseAllAction.
      *
@@ -44,9 +46,11 @@
      */
     public EraseSearchAction( SearchView view )
     {
-        super( "Erase Search");
+        super( "Erase Search" );
         setToolTipText( getText() );
-        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_ERASE_SEARCH )  );
+        setId( PluginConstants.CMD_ERASE_SEARCH );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+            PluginConstants.IMG_ERASE_SEARCH ) );
         setEnabled( true );
 
         this.view = view;
@@ -58,10 +62,7 @@
      */
     public void run()
     {
-        SearchView searchView = ( SearchView ) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-        .findView( SearchView.ID );
-        
-        searchView.setSearch( "", SearchView.SEARCH_ALL );
+        view.setSearch( "", SearchView.SEARCH_ALL );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -52,10 +52,11 @@
     public HideAttributeTypesAction( HierarchyView view )
     {
         super( "Hide Attribute Types", AS_CHECK_BOX );
-        super.setActionDefinitionId( Activator.PLUGIN_ID + "hideAttributeTypes" );
-        super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_HIDE_ATTRIBUTE_TYPES );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_HIDE_ATTRIBUTE_TYPES ) );
-        super.setEnabled( true );
+        setEnabled( true );
         hierarchyView = view;
 
         // Setting up the default key value (if needed)

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -52,10 +52,11 @@
     public HideObjectClassesAction( HierarchyView view )
     {
         super( "Hide Object Classes", AS_CHECK_BOX );
-        super.setActionDefinitionId( Activator.PLUGIN_ID + "hideObjectClasses" );
-        super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_HIDE_OBJECT_CLASSES );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_HIDE_OBJECT_CLASSES ) );
-        super.setEnabled( true );
+        setEnabled( true );
         hierarchyView = view;
 
         // Setting up the default key value (if needed)
@@ -65,7 +66,7 @@
         }
 
         // Setting state from the dialog settings
-        super.setChecked( Activator.getDefault().getDialogSettings().getBoolean( HIDE_OBJECT_CLASSES_DS_KEY ) );
+        setChecked( Activator.getDefault().getDialogSettings().getBoolean( HIDE_OBJECT_CLASSES_DS_KEY ) );
     }
 
 
@@ -76,7 +77,7 @@
     {
         setChecked( isChecked() );
         Activator.getDefault().getDialogSettings().put( HIDE_OBJECT_CLASSES_DS_KEY, isChecked() );
-        
+
         hierarchyView.refresh();
     }
 }

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -169,10 +169,11 @@
     public LinkWithEditorHierarchyView( HierarchyView view )
     {
         super( "Link with Editor", AS_CHECK_BOX );
-        super.setActionDefinitionId( Activator.PLUGIN_ID + "linkwitheditorschemasview" );
-        super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_LINK_WITH_EDITOR_HIERARCHY_VIEW );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_LINK_WITH_EDITOR ) );
-        super.setEnabled( true );
+        setEnabled( true );
         hierarchyView = view;
 
         // Setting up the default key value (if needed)
@@ -182,14 +183,13 @@
         }
 
         // Setting state from the dialog settings
-        super
-            .setChecked( Activator.getDefault().getDialogSettings().getBoolean( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) );
+        setChecked( Activator.getDefault().getDialogSettings().getBoolean( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) );
 
         // Enabling the listeners
         if ( isChecked() )
         {
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener( editorListener );
-            hierarchyView.getSite().getPage().addPostSelectionListener( HierarchyView.ID, viewListener );
+            hierarchyView.getSite().getPage().addPostSelectionListener( viewListener );
         }
     }
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -168,10 +168,11 @@
     public LinkWithEditorSchemasView( SchemasView view )
     {
         super( "Link with Editor", AS_CHECK_BOX );
-        super.setActionDefinitionId( Activator.PLUGIN_ID + "linkwitheditorschemasview" );
-        super.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_LINK_WITH_EDITOR_SCHEMA_VIEW );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
             PluginConstants.IMG_LINK_WITH_EDITOR ) );
-        super.setEnabled( true );
+        setEnabled( true );
         schemasView = view;
 
         // Setting up the default key value (if needed)
@@ -181,14 +182,13 @@
         }
 
         // Setting state from the dialog settings
-        super
-            .setChecked( Activator.getDefault().getDialogSettings().getBoolean( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) );
+        setChecked( Activator.getDefault().getDialogSettings().getBoolean( LINK_WITH_EDITOR_SCHEMAS_VIEW_DS_KEY ) );
 
         // Enabling the listeners
         if ( isChecked() )
         {
             PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener( editorListener );
-            schemasView.getSite().getPage().addPostSelectionListener( SchemasView.ID, viewListener );
+            schemasView.getSite().getPage().addPostSelectionListener( viewListener );
         }
     }
 

Modified: 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/OpenHierarchyViewPreferencesAction.java?view=diff&rev=515541&r1=515540&r2=515541
==============================================================================
--- 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/OpenHierarchyViewPreferencesAction.java Wed Mar  7 03:46:47 2007
@@ -20,6 +20,8 @@
 
 package org.apache.directory.ldapstudio.schemas.controller.actions;
 
+
+import org.apache.directory.ldapstudio.schemas.PluginConstants;
 import org.apache.directory.ldapstudio.schemas.view.preferences.HierarchyViewPreferencePage;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.widgets.Display;
@@ -41,16 +43,19 @@
     public OpenHierarchyViewPreferencesAction()
     {
         super( "Preferences..." );
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_HIERARCHY_VIEW_PREFERENCES );
         setEnabled( true );
     }
-    
-    
+
+
     /* (non-Javadoc)
      * @see org.eclipse.jface.action.Action#run()
      */
     public void run()
     {
         Shell shell = Display.getCurrent().getActiveShell();
-        PreferencesUtil.createPreferenceDialogOn( shell, HierarchyViewPreferencePage.ID, new String[] { HierarchyViewPreferencePage.ID }, null ).open();
+        PreferencesUtil.createPreferenceDialogOn( shell, HierarchyViewPreferencePage.ID, new String[]
+            { HierarchyViewPreferencePage.ID }, null ).open();
     }
 }

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -47,6 +47,8 @@
     public OpenHierarchyViewSortDialogAction()
     {
         super( "Sorting..." );
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_HIERARCHY_VIEW_SORT_DIALOG );
         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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.preferences.SchemasEditorPreferencePage;
@@ -50,12 +49,11 @@
      */
     public OpenLocalFileAction()
     {
-        setText( Messages.getString( "OpenLocalFileAction.Open_a_schema_file" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_OPEN_LOCAL );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_OPEN_LOCAL );
+        super( Messages.getString( "OpenLocalFileAction.Open_a_schema_file" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_OPEN_LOCAL );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_OPEN ) );
+        setEnabled( true );
     }
 
 
@@ -68,7 +66,8 @@
         fd.setText( Messages.getString( "OpenLocalFileAction.Open_a_schema_file" ) ); //$NON-NLS-1$
 
         IEclipsePreferences prefs = new ConfigurationScope().getNode( Activator.PLUGIN_ID );
-        String defaultPath = prefs.get( SchemasEditorPreferencePage.DEFAULT_DIRECTORY, System.getProperty( "user.home" ) ); //$NON-NLS-1$
+        String defaultPath = prefs
+            .get( SchemasEditorPreferencePage.DEFAULT_DIRECTORY, System.getProperty( "user.home" ) ); //$NON-NLS-1$
         fd.setFilterPath( defaultPath );
         String[] filterExt =
             { "*.schema", "*.*" }; //$NON-NLS-1$ //$NON-NLS-2$

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.editors.SchemaFormEditor;
 import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditorInput;
 import org.apache.directory.ldapstudio.schemas.view.editors.SchemaFormEditorSourceCodePage;
@@ -52,14 +51,12 @@
      */
     public OpenSchemaSourceCode()
     {
-        setText( "View source code" );
-
-        // The id is used to refer to the action in a menu or toolbar
-        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 );
+        super( "View source code" );
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_OPEN_SCHEMA_SOURCE_CODE );
         setImageDescriptor( AbstractUIPlugin
             .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SCHEMA ) );
+        setEnabled( true );
     }
 
 

Modified: directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewPreferencesAction.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewPreferencesAction.java?view=diff&rev=515541&r1=515540&r2=515541
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewPreferencesAction.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-schemas-plugin/src/main/java/org/apache/directory/ldapstudio/schemas/controller/actions/OpenSchemasViewPreferencesAction.java Wed Mar  7 03:46:47 2007
@@ -21,6 +21,7 @@
 package org.apache.directory.ldapstudio.schemas.controller.actions;
 
 
+import org.apache.directory.ldapstudio.schemas.PluginConstants;
 import org.apache.directory.ldapstudio.schemas.view.preferences.SchemasViewPreferencePage;
 import org.eclipse.jface.action.Action;
 import org.eclipse.swt.widgets.Display;
@@ -42,6 +43,8 @@
     public OpenSchemasViewPreferencesAction()
     {
         super( "Preferences..." );
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_SCHEMAS_VIEW_PREFERENCES );
         setEnabled( true );
     }
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -20,6 +20,7 @@
 
 package org.apache.directory.ldapstudio.schemas.controller.actions;
 
+
 import org.apache.directory.ldapstudio.schemas.Activator;
 import org.apache.directory.ldapstudio.schemas.PluginConstants;
 import org.apache.directory.ldapstudio.schemas.view.viewers.SchemasViewSortDialog;
@@ -36,7 +37,7 @@
  */
 public class OpenSchemasViewSortDialogAction extends Action
 {
-    
+
     /**
      * Creates a new instance of OpenSortDialogAction.
      *
@@ -46,10 +47,13 @@
     public OpenSchemasViewSortDialogAction()
     {
         super( "Sorting..." );
-        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SORT )  );
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_SCHEMAS_VIEW_SORT_DIALOG );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SORT ) );
         setEnabled( true );
     }
-    
+
+
     /* (non-Javadoc)
      * @see org.eclipse.jface.action.Action#run()
      */

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.viewers.SchemasView;
@@ -51,13 +50,12 @@
      */
     public RemoveSchemaAction()
     {
-        setText( Messages.getString( "RemoveSchemaAction.Remove_the_selected_schema" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_REMOVE_SCHEMA );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_REMOVE_SCHEMA );
-        setImageDescriptor( AbstractUIPlugin
-            .imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_REMOVE_SCHEMA ) );
+        super( Messages.getString( "RemoveSchemaAction.Remove_the_selected_schema" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_REMOVE_SCHEMA );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+            PluginConstants.IMG_REMOVE_SCHEMA ) );
+        setEnabled( true );
     }
 
 
@@ -117,7 +115,9 @@
                 }
             }
             else
+            {
                 pool.removeSchema( 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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.viewers.SchemasView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.AttributeTypeWrapper;
@@ -61,12 +60,11 @@
      */
     public SaveAction()
     {
-        setText( Messages.getString( "SaveAction.Save_schema" ) ); //$NON-NLS-1$
-        // The id is used to refer to the action in a menu or toolbar
-        setId( ICommandIds.CMD_SAVE );
-        // Associate the action with a pre-defined command, to allow key bindings.
-        setActionDefinitionId( ICommandIds.CMD_SAVE );
+        super( Messages.getString( "SaveAction.Save_schema" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_SAVE );
         setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID, PluginConstants.IMG_SAVE ) );
+        setEnabled( true );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.log4j.Logger;
 import org.eclipse.core.runtime.IStatus;
@@ -55,13 +54,12 @@
      */
     public SaveAllAction()
     {
-        setText( Messages.getString( "SaveAllAction.Save_all_schemas" ) ); //$NON-NLS-1$
-
-        // The id is used to refer to the action in a menu or toolbar
-        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, PluginConstants.IMG_SAVE_ALL ) );
+        super( Messages.getString( "SaveAllAction.Save_all_schemas" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_SAVE_ALL );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+            PluginConstants.IMG_SAVE_ALL ) );
+        setEnabled( true );
     }
 
 

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=515541&r1=515540&r2=515541
==============================================================================
--- 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 Wed Mar  7 03:46:47 2007
@@ -23,7 +23,6 @@
 
 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.viewers.SchemasView;
 import org.apache.directory.ldapstudio.schemas.view.viewers.wrappers.SchemaWrapper;
@@ -58,13 +57,12 @@
      */
     public SaveAsAction()
     {
-        setText( Messages.getString( "SaveAsAction.Save_schema_as" ) ); //$NON-NLS-1$
-
-        // The id is used to refer to the action in a menu or toolbar
-        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, PluginConstants.IMG_SAVE_AS ) );
+        super( Messages.getString( "SaveAsAction.Save_schema_as" ) ); //$NON-NLS-1$
+        setToolTipText( getText() );
+        setId( PluginConstants.CMD_SAVE_AS );
+        setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( Activator.PLUGIN_ID,
+            PluginConstants.IMG_SAVE_AS ) );
+        setEnabled( true );
     }
 
 



Mime
View raw message