You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2008/08/28 17:47:09 UTC
svn commit: r689857 - in
/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor:
./ controller/actions/
Author: pamarcelot
Date: Thu Aug 28 08:47:07 2008
New Revision: 689857
URL: http://svn.apache.org/viewvc?rev=689857&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).
Modified:
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Activator.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CloseProjectAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CollapseAllAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CommitChangesAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportProjectsAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsOpenLdapAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsXmlAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasForADSAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportCoreSchemasAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportProjectsAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromXmlAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenHierarchyViewPreferencesAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenProjectAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewPreferenceAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewSortingDialogAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewPreferenceAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewSortingDialogAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RunCurrentSearchAgainAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchFieldAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchHistoryAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSubtypeHierarchyAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSupertypeHierarchyAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowTypeHierarchyAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToFlatAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToHierarchicalAction.java
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Activator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Activator.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Activator.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/Activator.java Thu Aug 28 08:47:07 2008
@@ -20,9 +20,11 @@
package org.apache.directory.studio.schemaeditor;
+import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
+import java.util.PropertyResourceBundle;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerListener;
@@ -36,6 +38,7 @@
import org.apache.directory.studio.schemaeditor.view.widget.SchemaTextAttributeProvider;
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.rules.ITokenScanner;
import org.eclipse.swt.graphics.Image;
@@ -73,6 +76,9 @@
/** The ProjectsHandler */
private ProjectsHandler projectsHandler;
+ /** The plugin properties */
+ private PropertyResourceBundle properties;
+
/**
* Creates a new instance of Activator.
@@ -307,4 +313,31 @@
}
return image;
}
+
+
+ /**
+ * Gets the plugin properties.
+ *
+ * @return
+ * the plugin properties
+ */
+ public PropertyResourceBundle getPluginProperties()
+ {
+ if ( properties == null )
+ {
+ try
+ {
+ properties = new PropertyResourceBundle( FileLocator.openStream( this.getBundle(), new Path(
+ "plugin.properties" ), false ) );
+ }
+ catch ( IOException e )
+ {
+ getLog().log(
+ new Status( Status.ERROR, Activator.PLUGIN_ID, Status.OK,
+ "Unable to get the plugin properties.", e ) );
+ }
+ }
+
+ return properties;
+ }
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java Thu Aug 28 08:47:07 2008
@@ -110,54 +110,24 @@
public static final String IMG_WARNING_32X32 = "resources/icons/warning_32x32.png";
// Commands
- public static final String CMD_COMMIT_CHANGES = Activator.PLUGIN_ID + ".commands.commitChanges";
- public static final String CMD_CONNECT = Activator.PLUGIN_ID + ".commands.connect";
- public static final String CMD_CLOSE_PROJECT = Activator.PLUGIN_ID + ".commands.closeProject";
- public static final String CMD_COLLAPSE_ALL = Activator.PLUGIN_ID + ".commands.collapseAll";
- public static final String CMD_DELETE_PROJECT = Activator.PLUGIN_ID + ".commands.deleteProject";
- public static final String CMD_DELETE_SCHEMA_ELEMENT = Activator.PLUGIN_ID + ".commands.deleteSchemaElement";
- public static final String CMD_EXPORT_PROJECTS = Activator.PLUGIN_ID + ".commands.exportProjects";
- public static final String CMD_EXPORT_SCHEMAS_AS_OPENLDAP = Activator.PLUGIN_ID
- + ".commands.exportSchemasAsOpenLDAP";
- public static final String CMD_EXPORT_SCHEMAS_AS_XML = Activator.PLUGIN_ID + ".commands.exportSchemasAsXML";
- public static final String CMD_EXPORT_SCHEMAS_FOR_ADS = Activator.PLUGIN_ID + ".commands.exportSchemasForADS";
- public static final String CMD_IMPORT_CORE_SCHEMAS = Activator.PLUGIN_ID + ".commands.importCoreSchemas";
- public static final String CMD_IMPORT_PROJECTS = Activator.PLUGIN_ID + ".commands.importProjects";
- public static final String CMD_IMPORT_SCHEMAS_FROM_OPENLDAP = Activator.PLUGIN_ID
- + ".commands.importSchemasFromOpenLDAP";
- public static final String CMD_IMPORT_SCHEMAS_FROM_XML = Activator.PLUGIN_ID + ".commands.importSchemasFromXML";
- public static final String CMD_LINK_WITH_EDITOR_SCHEMA_VIEW = Activator.PLUGIN_ID
- + ".commands.linkWithEditorSchemaView";
- public static final String CMD_LINK_WITH_EDITOR_HIERARCHY_VIEW = Activator.PLUGIN_ID
- + ".commands.linkWithEditorHierarchyView";
- public static final String CMD_OPEN_ELEMENT = Activator.PLUGIN_ID + ".commands.openElement";
- public static final String CMD_OPEN_HIERARCHY_VIEW_PREFERENCES = Activator.PLUGIN_ID
- + ".commands.openHierarchyViewPreference";
- public static final String CMD_OPEN_PROJECT = Activator.PLUGIN_ID + ".commands.openProject";
- public static final String CMD_OPEN_SCHEMA_VIEW_PREFERENCE = Activator.PLUGIN_ID
- + ".commands.openSchemaViewPreference";
- public static final String CMD_OPEN_SCHEMA_VIEW_SORTING_DIALOG = Activator.PLUGIN_ID
- + ".commands.openSchemaViewSortingDialog";
- public static final String CMD_OPEN_SEARCH_VIEW_PREFERENCE = Activator.PLUGIN_ID
- + ".commands.openSearchViewPreference";
- public static final String CMD_OPEN_SEARCH_VIEW_SORTING_DIALOG = Activator.PLUGIN_ID
- + ".commands.openSearchViewSortingDialog";
- public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.PLUGIN_ID + ".commands.openTypeHierarchy";
- public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.PLUGIN_ID + ".commands.newAttributeType";
- public static final String CMD_NEW_OBJECT_CLASS = Activator.PLUGIN_ID + ".commands.newObjectClass";
- public static final String CMD_NEW_PROJECT = Activator.PLUGIN_ID + ".commands.newProject";
- public static final String CMD_NEW_SCHEMA = Activator.PLUGIN_ID + ".commands.newSchema";
- public static final String CMD_RENAME_PROJECT = Activator.PLUGIN_ID + ".commands.renameProject";
- public static final String CMD_RUN_CURRENT_SEARCH_AGAIN = Activator.PLUGIN_ID + ".commands.runCurrentSearchAgain";
- public static final String CMD_SHOW_SEARCH_FIELD = Activator.PLUGIN_ID + ".commands.showSearchField";
- public static final String CMD_SHOW_SEARCH_HISTORY = Activator.PLUGIN_ID + ".commands.showSearchHistory";
- public static final String CMD_SHOW_SUBTYPE_HIERARCHY = Activator.PLUGIN_ID + ".commands.showSubTypeHierarchy";
- public static final String CMD_SHOW_SUPERTYPE_HIERARCHY = Activator.PLUGIN_ID + ".commands.showSuperTypeHierarchy";
- public static final String CMD_SHOW_TYPE_HIERARCHY = Activator.PLUGIN_ID + ".commands.showSubTypeHierarchy";
- public static final String CMD_SWITCH_SCHEMA_PRESENTATION_TO_FLAT = Activator.PLUGIN_ID
- + ".commands.switchSchemaPresentationToFlat";
- public static final String CMD_SWITCH_SCHEMA_PRESENTATION_TO_HIERARCHICAL = Activator.PLUGIN_ID
- + ".commands.switchSchemaPresentationToHierarchical";
+ public static final String CMD_DELETE_PROJECT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_DeleteProject_id" );
+ public static final String CMD_DELETE_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_DeleteSchemaElement_id" );
+ public static final String CMD_OPEN_ELEMENT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_OpenElement_id" );
+ public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_OpenTypeHierarchy_id" );
+ public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_NewAttributeType_id" );
+ public static final String CMD_NEW_OBJECT_CLASS = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_NewObjectClass_id" );
+ public static final String CMD_NEW_PROJECT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_NewProject_id" );
+ public static final String CMD_NEW_SCHEMA = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_NewSchema_id" );
+ public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
+ "Cmd_RenameProject_id" );
// Preferences - DifferencesWidget
/** The preferences ID for DifferencesWidget Grouping */
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CloseProjectAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CloseProjectAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CloseProjectAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CloseProjectAction.java Thu Aug 28 08:47:07 2008
@@ -21,7 +21,6 @@
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerAdapter;
import org.apache.directory.studio.schemaeditor.model.Project;
@@ -63,7 +62,6 @@
{
super( "Clo&se Project" );
setToolTipText( "Close Project" );
- setId( PluginConstants.CMD_CLOSE_PROJECT );
setEnabled( false );
this.viewer = viewer;
this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CollapseAllAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CollapseAllAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CollapseAllAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CollapseAllAction.java Thu Aug 28 08:47:07 2008
@@ -52,7 +52,6 @@
{
super( "Collapse All" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_COLLAPSE_ALL );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_COLLAPSE_ALL ) );
setEnabled( false );
this.viewer = viewer;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CommitChangesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CommitChangesAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CommitChangesAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/CommitChangesAction.java Thu Aug 28 08:47:07 2008
@@ -48,7 +48,6 @@
{
super( "Commit Changes" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_COMMIT_CHANGES );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_COMMIT_CHANGES ) );
setEnabled( false );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportProjectsAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportProjectsAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportProjectsAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportProjectsAction.java Thu Aug 28 08:47:07 2008
@@ -59,7 +59,6 @@
{
super( "Schema Projects" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_EXPORT_PROJECTS );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_EXPORT ) );
setEnabled( true );
this.viewer = viewer;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsOpenLdapAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsOpenLdapAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsOpenLdapAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsOpenLdapAction.java Thu Aug 28 08:47:07 2008
@@ -59,7 +59,6 @@
{
super( "Schemas as OpenLDAP files" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_EXPORT_SCHEMAS_AS_OPENLDAP );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_EXPORT ) );
setEnabled( true );
this.viewer = viewer;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsXmlAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsXmlAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsXmlAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasAsXmlAction.java Thu Aug 28 08:47:07 2008
@@ -59,7 +59,6 @@
{
super( "Schemas as XML file(s)" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_EXPORT_SCHEMAS_AS_XML );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_EXPORT ) );
setEnabled( true );
this.viewer = viewer;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasForADSAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasForADSAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasForADSAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ExportSchemasForADSAction.java Thu Aug 28 08:47:07 2008
@@ -59,7 +59,6 @@
{
super( "Schemas for Apache DS" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_EXPORT_SCHEMAS_FOR_ADS );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_EXPORT_FOR_ADS ) );
setEnabled( true );
this.viewer = viewer;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportCoreSchemasAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportCoreSchemasAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportCoreSchemasAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportCoreSchemasAction.java Thu Aug 28 08:47:07 2008
@@ -48,7 +48,6 @@
{
super( "Core schemas files" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_IMPORT_CORE_SCHEMAS );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT ) );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportProjectsAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportProjectsAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportProjectsAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportProjectsAction.java Thu Aug 28 08:47:07 2008
@@ -48,7 +48,6 @@
{
super( "Schema Projects" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_IMPORT_PROJECTS );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_PROJECT_IMPORT ) );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromOpenLdapAction.java Thu Aug 28 08:47:07 2008
@@ -48,7 +48,6 @@
{
super( "Schemas from OpenLDAP files" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_IMPORT_SCHEMAS_FROM_OPENLDAP );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT ) );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromXmlAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromXmlAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromXmlAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ImportSchemasFromXmlAction.java Thu Aug 28 08:47:07 2008
@@ -48,7 +48,6 @@
{
super( "Schemas from XML file(s)" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_IMPORT_SCHEMAS_FROM_XML );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SCHEMAS_IMPORT ) );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorHierarchyViewAction.java Thu Aug 28 08:47:07 2008
@@ -140,7 +140,6 @@
{
super( "Lin&k with Editor", AS_CHECK_BOX );
setToolTipText( "Link with Editor" );
- setId( PluginConstants.CMD_LINK_WITH_EDITOR_HIERARCHY_VIEW );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_LINK_WITH_EDITOR ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/LinkWithEditorSchemaViewAction.java Thu Aug 28 08:47:07 2008
@@ -196,7 +196,6 @@
{
super( "Lin&k with Editor", AS_CHECK_BOX );
setToolTipText( "Link with Editor" );
- setId( PluginConstants.CMD_LINK_WITH_EDITOR_SCHEMA_VIEW );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_LINK_WITH_EDITOR ) );
setEnabled( false );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenHierarchyViewPreferencesAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenHierarchyViewPreferencesAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenHierarchyViewPreferencesAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenHierarchyViewPreferencesAction.java Thu Aug 28 08:47:07 2008
@@ -21,7 +21,6 @@
package org.apache.directory.studio.schemaeditor.controller.actions;
-import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.preferences.HierarchyViewPreferencePage;
import org.eclipse.jface.action.Action;
import org.eclipse.swt.widgets.Display;
@@ -44,7 +43,6 @@
{
super( "&Preferences..." );
setToolTipText( "Preferences..." );
- setId( PluginConstants.CMD_OPEN_HIERARCHY_VIEW_PREFERENCES );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenProjectAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenProjectAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenProjectAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenProjectAction.java Thu Aug 28 08:47:07 2008
@@ -21,7 +21,6 @@
import org.apache.directory.studio.schemaeditor.Activator;
-import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerAdapter;
import org.apache.directory.studio.schemaeditor.model.Project;
@@ -63,7 +62,6 @@
{
super( "Op&en Project" );
setToolTipText( "Open Project" );
- setId( PluginConstants.CMD_OPEN_PROJECT );
setEnabled( false );
this.viewer = viewer;
this.viewer.addSelectionChangedListener( new ISelectionChangedListener()
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewPreferenceAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewPreferenceAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewPreferenceAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewPreferenceAction.java Thu Aug 28 08:47:07 2008
@@ -20,7 +20,6 @@
package org.apache.directory.studio.schemaeditor.controller.actions;
-import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.preferences.SchemaViewPreferencePage;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
@@ -47,7 +46,6 @@
{
super( "&Preferences..." );
setToolTipText( "Preferences..." );
- setId( PluginConstants.CMD_OPEN_SCHEMA_VIEW_PREFERENCE );
setEnabled( false );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewSortingDialogAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewSortingDialogAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewSortingDialogAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSchemaViewSortingDialogAction.java Thu Aug 28 08:47:07 2008
@@ -46,7 +46,6 @@
{
super( "&Sorting..." );
setToolTipText( "Sorting..." );
- setId( PluginConstants.CMD_OPEN_SCHEMA_VIEW_SORTING_DIALOG );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SORTING ) );
setEnabled( false );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewPreferenceAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewPreferenceAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewPreferenceAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewPreferenceAction.java Thu Aug 28 08:47:07 2008
@@ -20,7 +20,6 @@
package org.apache.directory.studio.schemaeditor.controller.actions;
-import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.preferences.SearchViewPreferencePage;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IAction;
@@ -47,7 +46,6 @@
{
super( "&Preferences..." );
setToolTipText( "Preferences..." );
- setId( PluginConstants.CMD_OPEN_SEARCH_VIEW_PREFERENCE );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewSortingDialogAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewSortingDialogAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewSortingDialogAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenSearchViewSortingDialogAction.java Thu Aug 28 08:47:07 2008
@@ -46,7 +46,6 @@
{
super( "&Sorting..." );
setToolTipText( "Sorting..." );
- setId( PluginConstants.CMD_OPEN_SEARCH_VIEW_SORTING_DIALOG );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SORTING ) );
setEnabled( true );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RunCurrentSearchAgainAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RunCurrentSearchAgainAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RunCurrentSearchAgainAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/RunCurrentSearchAgainAction.java Thu Aug 28 08:47:07 2008
@@ -49,7 +49,6 @@
{
super( "Run the Current Search Again" );
setToolTipText( getText() );
- setId( PluginConstants.CMD_RUN_CURRENT_SEARCH_AGAIN );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_RUN_CURRENT_SEARCH_AGAIN ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchFieldAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchFieldAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchFieldAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchFieldAction.java Thu Aug 28 08:47:07 2008
@@ -52,7 +52,6 @@
{
super( "Show Search Field", AS_CHECK_BOX );
setToolTipText( getText() );
- setId( PluginConstants.CMD_SHOW_SEARCH_FIELD );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SHOW_SEARCH_FIELD ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchHistoryAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchHistoryAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchHistoryAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSearchHistoryAction.java Thu Aug 28 08:47:07 2008
@@ -60,7 +60,6 @@
super( "Search History", AS_DROP_DOWN_MENU );
this.view = view;
setToolTipText( getText() );
- setId( PluginConstants.CMD_SHOW_SEARCH_HISTORY );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SHOW_SEARCH_HISTORY ) );
setEnabled( true );
setMenuCreator( new MenuCreator( view ) );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSubtypeHierarchyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSubtypeHierarchyAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSubtypeHierarchyAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSubtypeHierarchyAction.java Thu Aug 28 08:47:07 2008
@@ -45,7 +45,6 @@
{
super( "Su&btype Hierarchy", AS_RADIO_BUTTON );
setToolTipText( "Show the Subtype Hierarchy" );
- setId( PluginConstants.CMD_SHOW_SUBTYPE_HIERARCHY );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SHOW_SUBTYPE_HIERARCHY ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSupertypeHierarchyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSupertypeHierarchyAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSupertypeHierarchyAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowSupertypeHierarchyAction.java Thu Aug 28 08:47:07 2008
@@ -45,7 +45,6 @@
{
super( "Su&pertype Hierarchy", AS_RADIO_BUTTON );
setToolTipText( "Show the Supertype Hierarchy" );
- setId( PluginConstants.CMD_SHOW_SUPERTYPE_HIERARCHY );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SHOW_SUPERTYPE_HIERARCHY ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowTypeHierarchyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowTypeHierarchyAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowTypeHierarchyAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/ShowTypeHierarchyAction.java Thu Aug 28 08:47:07 2008
@@ -45,7 +45,6 @@
{
super( "&Type Hierarchy", AS_RADIO_BUTTON );
setToolTipText( "Show the Type Hierarchy" );
- setId( PluginConstants.CMD_SHOW_TYPE_HIERARCHY );
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_SHOW_TYPE_HIERARCHY ) );
setEnabled( true );
this.view = view;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToFlatAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToFlatAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToFlatAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToFlatAction.java Thu Aug 28 08:47:07 2008
@@ -44,7 +44,6 @@
{
super( "&Flat", AS_RADIO_BUTTON );
setToolTipText( "Flat" );
- setId( PluginConstants.CMD_SWITCH_SCHEMA_PRESENTATION_TO_FLAT );
setEnabled( false );
// Setting up the state of the action
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToHierarchicalAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToHierarchicalAction.java?rev=689857&r1=689856&r2=689857&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToHierarchicalAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/SwitchSchemaPresentationToHierarchicalAction.java Thu Aug 28 08:47:07 2008
@@ -44,7 +44,6 @@
{
super( "&Hierarchical", AS_RADIO_BUTTON );
setToolTipText( "Hierarchical" );
- setId( PluginConstants.CMD_SWITCH_SCHEMA_PRESENTATION_TO_HIERARCHICAL );
setEnabled( false );
// Setting up the state of the action