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/29 16:13:56 UTC
svn commit: r690266 - in /directory/studio/trunk/schemaeditor: ./
src/main/java/org/apache/directory/studio/schemaeditor/
src/main/java/org/apache/directory/studio/schemaeditor/view/
src/main/java/org/apache/directory/studio/schemaeditor/view/editors/a...
Author: pamarcelot
Date: Fri Aug 29 07:13:53 2008
New Revision: 690266
URL: http://svn.apache.org/viewvc?rev=690266&view=rev
Log:
Part of a fix for DIRSTUDIO-375 (Move each plugin IDs in a plugin.properties file).
Modified:
directory/studio/trunk/schemaeditor/plugin.properties
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/PluginUtils.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Perspective.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/HierarchyViewPreferencePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SchemaViewPreferencePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SearchViewPreferencePage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java
Modified: directory/studio/trunk/schemaeditor/plugin.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/plugin.properties?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/plugin.properties (original)
+++ directory/studio/trunk/schemaeditor/plugin.properties Fri Aug 29 07:13:53 2008
@@ -15,9 +15,16 @@
# specific language governing permissions and limitations
# under the License.
+Plugin_id="org.apache.directory.studio.schemaeditor"
+
Perspective_SchemaEditor_id=org.apache.directory.studio.schemaeditor.perspective
Perspective_SchemaEditor_name=Schema Editor
+Perspective_LdapBrowser_id=org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective
+
+Perspective_TopLeftFolder_id=org.apache.directory.studio.schemaeditor.topleftfolder
+Perspective_BottomFolder_id=org.apache.directory.studio.schemaeditor.bottomfolder
+
Views_Category_id=org.apache.directory.studio.schemaeditor.view.category
Views_Category_name=Schema Editor
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=690266&r1=690265&r2=690266&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 Fri Aug 29 07:13:53 2008
@@ -55,9 +55,6 @@
*/
public class Activator extends AbstractUIPlugin
{
- /** The plug-in ID */
- public static final String PLUGIN_ID = "org.apache.directory.studio.schemaeditor"; //$NON-NLS-1$
-
/** The shared instance */
private static Activator plugin;
@@ -332,8 +329,10 @@
}
catch ( IOException e )
{
+ // We can't use the PLUGIN_ID constant since loading the plugin.properties file has failed,
+ // So we're using a default plugin id.
getLog().log(
- new Status( Status.ERROR, Activator.PLUGIN_ID, Status.OK,
+ new Status( Status.ERROR, "org.apache.directory.studio.schemaeditor", Status.OK,
"Unable to get the plugin properties.", e ) );
}
}
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=690266&r1=690265&r2=690266&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 Fri Aug 29 07:13:53 2008
@@ -33,6 +33,85 @@
*/
public interface PluginConstants
{
+ /** The plug-in ID */
+ public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" );
+
+ /** The Schema Editor perspective ID */
+ public static final String PERSPECTIVE_SCHEMA_EDITOR_ID = Activator.getDefault().getPluginProperties().getString(
+ "Perspective_SchemaEditor_id" );
+
+ /** The LDAP Browser perspective ID */
+ public static final String PERSPECTIVE_LDAP_BROWSER_ID = Activator.getDefault().getPluginProperties().getString(
+ "Perspective_LdapBrowser_id" );
+
+ /** The top left folder ID */
+ public static final String PERSPECTIVE_TOP_LEFT_FOLDER_ID = Activator.getDefault().getPluginProperties().getString(
+ "Perspective_TopLeftFolder_id" );
+
+ /** The bottom folder ID */
+ public static final String PERSPECTIVE_BOTTOM_FOLDER_ID = Activator.getDefault().getPluginProperties().getString(
+ "Perspective_BottomFolder_id" );
+
+ /** The Attribute Type Editor ID */
+ public static final String EDITOR_ATTRIBUTE_TYPE_ID = Activator.getDefault().getPluginProperties().getString(
+ "Editor_AttributeTypeEditor_id" );
+
+ /** The Object Class Editor ID */
+ public static final String EDITOR_OBJECT_CLASS_ID = Activator.getDefault().getPluginProperties().getString(
+ "Editor_ObjectClassEditor_id" );
+
+ /** The Schema Editor ID */
+ public static final String EDITOR_SCHEMA_ID = Activator.getDefault().getPluginProperties().getString(
+ "Editor_SchemaEditor_id" );
+
+ /** The Hierarchy View Preference Page ID */
+ public static final String PREF_PAGE_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "PrefPage_HierarchyView_id" );
+
+ /** The Schema View Preference Page ID */
+ public static final String PREF_PAGE_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "PrefPage_SchemaView_id" );
+
+ /** The Search View Preference Page ID */
+ public static final String PREF_PAGE_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "PrefPage_SearchView_id" );
+
+ /** The Hierarchy View ID */
+ public static final String VIEW_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "View_HierarchyView_id" );
+
+ /** The Problems View ID */
+ public static final String VIEW_PROBLEMS_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "View_ProblemsView_id" );
+
+ /** The Projects View ID */
+ public static final String VIEW_PROJECTS_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "View_ProjectsView_id" );
+
+ /** The Schema View ID */
+ public static final String VIEW_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "View_SchemaView_id" );
+
+ /** The Search View ID */
+ public static final String VIEW_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
+ "View_SearchView_id" );
+
+ /** The New Attribute Type Wizard ID */
+ public static final String NEW_WIZARD_NEW_ATTRIBUTE_TYPE_WIZARD = Activator.getDefault().getPluginProperties().getString(
+ "NewWizard_NewAttributeTypeWizard_id" );
+
+ /** The New Object Class Wizard ID */
+ public static final String NEW_WIZARD_NEW_OBJECT_CLASS_WIZARD = Activator.getDefault().getPluginProperties().getString(
+ "NewWizard_NewObjectClassWizard_id" );
+
+ /** The New Project Wizard ID */
+ public static final String NEW_WIZARD_NEW_PROJECT_WIZARD = Activator.getDefault().getPluginProperties().getString(
+ "NewWizard_NewProjectWizard_id" );
+
+ /** The New Schema Wizard ID */
+ public static final String NEW_WIZARD_NEW_SCHEMA_WIZARD = Activator.getDefault().getPluginProperties().getString(
+ "NewWizard_NewSchemaWizard_id" );
+
// Images
public static final String IMG_ATTRIBUTE_TYPE = "resources/icons/attribute_type.gif";
public static final String IMG_ATTRIBUTE_TYPE_HIERARCHY_SELECTED = "resources/icons/attribute_type_hierarchy_selected.gif";
@@ -113,25 +192,25 @@
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" );
+ "Cmd_DeleteSchemaElement_id" );
public static final String CMD_OPEN_ELEMENT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_OpenElement_id" );
+ "Cmd_OpenElement_id" );
public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.getDefault().getPluginProperties().getString(
- "Cmd_OpenTypeHierarchy_id" );
+ "Cmd_OpenTypeHierarchy_id" );
public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewAttributeType_id" );
+ "Cmd_NewAttributeType_id" );
public static final String CMD_NEW_OBJECT_CLASS = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewObjectClass_id" );
+ "Cmd_NewObjectClass_id" );
public static final String CMD_NEW_PROJECT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewProject_id" );
+ "Cmd_NewProject_id" );
public static final String CMD_NEW_SCHEMA = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewSchema_id" );
+ "Cmd_NewSchema_id" );
public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_RenameProject_id" );
+ "Cmd_RenameProject_id" );
// Preferences - DifferencesWidget
/** The preferences ID for DifferencesWidget Grouping */
- public static final String PREFS_DIFFERENCES_WIDGET_GROUPING = Activator.PLUGIN_ID
+ public static final String PREFS_DIFFERENCES_WIDGET_GROUPING = PluginConstants.PLUGIN_ID
+ ".prefs.DifferencesWidget.grouping";
/** The preference value for DifferencesWidget Grouping 'Property' */
public static final int PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY = 0;
@@ -174,19 +253,21 @@
public static final String PREFS_SCHEMA_VIEW_SCHEMA_LABEL_DISPLAY = SchemaViewPreferencePage.ID
+ ".schemaLabel.display"; //$NON-NLS-1$
/** The preference ID for Schema View Grouping */
- public static final String PREFS_SCHEMA_VIEW_GROUPING = Activator.PLUGIN_ID + ".preferences.SchemaView.grouping"; //$NON-NLS-1$
+ public static final String PREFS_SCHEMA_VIEW_GROUPING = PluginConstants.PLUGIN_ID
+ + ".preferences.SchemaView.grouping"; //$NON-NLS-1$
/** The preference value for Schema View Grouping 'group ATs and OCs in folders' */
public static final int PREFS_SCHEMA_VIEW_GROUPING_FOLDERS = 0;
/** The preference value for Schema View Grouping 'mixed' */
public static final int PREFS_SCHEMA_VIEW_GROUPING_MIXED = 1;
/** The preference ID for Schema View Sorting By */
- public static final String PREFS_SCHEMA_VIEW_SORTING_BY = Activator.PLUGIN_ID + ".preferences.SchemaView.sortingBy"; //$NON-NLS-1$
+ public static final String PREFS_SCHEMA_VIEW_SORTING_BY = PluginConstants.PLUGIN_ID
+ + ".preferences.SchemaView.sortingBy"; //$NON-NLS-1$
/** The preference value for Schema View Sorting 'First Name' */
public static final int PREFS_SCHEMA_VIEW_SORTING_BY_FIRSTNAME = 0;
/** The preference value for Schema View Sorting 'OID' */
public static final int PREFS_SCHEMA_VIEW_SORTING_BY_OID = 1;
/** The preference ID for Sorting Order */
- public static final String PREFS_SCHEMA_VIEW_SORTING_ORDER = Activator.PLUGIN_ID
+ public static final String PREFS_SCHEMA_VIEW_SORTING_ORDER = PluginConstants.PLUGIN_ID
+ ".preferences.SchemaView.sortingOrder"; //$NON-NLS-1$
/** The preference value for Schema View Sorting 'ascending' */
public static final int PREFS_SCHEMA_VIEW_SORTING_ORDER_ASCENDING = 0;
@@ -195,7 +276,8 @@
// Preferences - Hierarchy View
/** The preference ID for Mode of the Hierarchy View */
- public static final String PREFS_HIERARCHY_VIEW_MODE = Activator.PLUGIN_ID + ".preferences.HierarchyView.mode"; //$NON-NLS-1$
+ public static final String PREFS_HIERARCHY_VIEW_MODE = PluginConstants.PLUGIN_ID
+ + ".preferences.HierarchyView.mode"; //$NON-NLS-1$
/** The preference value for Hierarchy View Mode 'Supertype' */
public static final int PREFS_HIERARCHY_VIEW_MODE_SUPERTYPE = 0;
/** The preference value for Hierarchy View Mode 'Subtype' */
@@ -230,37 +312,37 @@
// Search - SearchPage
/** The preference ID for Search History of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_HISTORY = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_HISTORY = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.searchHistory"; //$NON-NLS-1$
/** The preference ID for Search In 'Aliases' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_ALIASES = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_ALIASES = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeAliases"; //$NON-NLS-1$
/** The preference ID for Search In 'OID' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OID = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OID = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeOid"; //$NON-NLS-1$
/** The preference ID for Search In 'Description' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_DESCRIPTION = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeDescription"; //$NON-NLS-1$
/** The preference ID for Search In 'Superior' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIOR = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeSuperior"; //$NON-NLS-1$
/** The preference ID for Search In 'Syntax' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SYNTAX = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SYNTAX = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeSyntax"; //$NON-NLS-1$
/** The preference ID for Search In 'Matching Rules' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_MATCHING_RULES = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_MATCHING_RULES = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeMatchingRules"; //$NON-NLS-1$
/** The preference ID for Search In 'Superiors' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIORS = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_SUPERIORS = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeSuperiors"; //$NON-NLS-1$
/** The preference ID for Search In 'Mandatory Attributes' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_MANDATORY_ATTRIBUTES = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeMandatoryAttributes"; //$NON-NLS-1$
/** The preference ID for Search In 'Optional Attributes' of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_PAGE_SEARCH_IN_OPTIONAL_ATTRIBUTES = PluginConstants.PLUGIN_ID
+ ".preferences.SearchPage.scopeOptionalAttributes"; //$NON-NLS-1$
/** The preference ID for Scope of the SearchPage */
- public static final String PREFS_SEARCH_PAGE_SCOPE = Activator.PLUGIN_ID + ".preferences.SearchPage.scope"; //$NON-NLS-1$
+ public static final String PREFS_SEARCH_PAGE_SCOPE = PluginConstants.PLUGIN_ID + ".preferences.SearchPage.scope"; //$NON-NLS-1$
/** The preference value for Scope Attribute Types And Object Classes of the SearchPage */
public static final int PREFS_SEARCH_PAGE_SCOPE_AT_AND_OC = 0;
/** The preference value for Scope Attribute Types only of the SearchPage */
@@ -295,7 +377,8 @@
public static final String PREFS_SEARCH_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH = SearchViewPreferencePage.ID
+ ".secondaryLabel.abbreviate.maxLength"; //$NON-NLS-1$
/** The preference ID for Search View Grouping */
- public static final String PREFS_SEARCH_VIEW_GROUPING = Activator.PLUGIN_ID + ".preferences.SearchView.grouping"; //$NON-NLS-1$
+ public static final String PREFS_SEARCH_VIEW_GROUPING = PluginConstants.PLUGIN_ID
+ + ".preferences.SearchView.grouping"; //$NON-NLS-1$
/** The preference value for Search View Grouping 'Display ATs first' */
public static final int PREFS_SEARCH_VIEW_GROUPING_ATTRIBUTE_TYPES_FIRST = 0;
/** The preference value for Search View Grouping 'Display OCs first' */
@@ -303,13 +386,14 @@
/** The preference value for Search View Grouping 'mixed' */
public static final int PREFS_SEARCH_VIEW_GROUPING_MIXED = 2;
/** The preference ID for Search View Sorting By */
- public static final String PREFS_SEARCH_VIEW_SORTING_BY = Activator.PLUGIN_ID + ".preferences.SearchView.sortingBy"; //$NON-NLS-1$
+ public static final String PREFS_SEARCH_VIEW_SORTING_BY = PluginConstants.PLUGIN_ID
+ + ".preferences.SearchView.sortingBy"; //$NON-NLS-1$
/** The preference value for Search View Sorting 'First Name' */
public static final int PREFS_SEARCH_VIEW_SORTING_BY_FIRSTNAME = 0;
/** The preference value for Search View Sorting 'OID' */
public static final int PREFS_SEARCH_VIEW_SORTING_BY_OID = 1;
/** The preference ID for Sorting Order */
- public static final String PREFS_SEARCH_VIEW_SORTING_ORDER = Activator.PLUGIN_ID
+ public static final String PREFS_SEARCH_VIEW_SORTING_ORDER = PluginConstants.PLUGIN_ID
+ ".preferences.SchemaView.sortingOrder"; //$NON-NLS-1$
/** The preference value for Search View Sorting 'ascending' */
public static final int PREFS_SEARCH_VIEW_SORTING_ORDER_ASCENDING = 0;
@@ -321,29 +405,31 @@
// Contexts
/** The Context for the SchemaView */
- public static final String CONTEXT_SCHEMA_VIEW = Activator.PLUGIN_ID + ".contexts.schemaView"; //$NON-NLS-1$
+ public static final String CONTEXT_SCHEMA_VIEW = PluginConstants.PLUGIN_ID + ".contexts.schemaView"; //$NON-NLS-1$
/** The Context for the SchemaView */
- public static final String CONTEXT_PROJECTS_VIEW = Activator.PLUGIN_ID + ".contexts.projectsView"; //$NON-NLS-1$
+ public static final String CONTEXT_PROJECTS_VIEW = PluginConstants.PLUGIN_ID + ".contexts.projectsView"; //$NON-NLS-1$
// File Dialogs
/** The File Dialog path for 'Export Schema Projects' */
- public static final String FILE_DIALOG_EXPORT_PROJECTS = Activator.PLUGIN_ID + ".fileDialog.exportProjects";
+ public static final String FILE_DIALOG_EXPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.exportProjects";
/** The File Dialog path for 'Export Schemas to OpenLDAP files' */
- public static final String FILE_DIALOG_EXPORT_SCHEMAS_OPENLDAP = Activator.PLUGIN_ID
+ public static final String FILE_DIALOG_EXPORT_SCHEMAS_OPENLDAP = PluginConstants.PLUGIN_ID
+ ".fileDialog.exportSchemasOpenLDAP";
/** The File Dialog path for 'Export Schemas to XML files' */
- public static final String FILE_DIALOG_EXPORT_SCHEMAS_XML = Activator.PLUGIN_ID + ".fileDialog.exportSchemasXML";
+ public static final String FILE_DIALOG_EXPORT_SCHEMAS_XML = PluginConstants.PLUGIN_ID
+ + ".fileDialog.exportSchemasXML";
/** The File Dialog path for 'Export Schemas for Apache DS' */
- public static final String FILE_DIALOG_EXPORT_SCHEMAS_APACHE_DS = Activator.PLUGIN_ID
+ public static final String FILE_DIALOG_EXPORT_SCHEMAS_APACHE_DS = PluginConstants.PLUGIN_ID
+ ".fileDialog.exportSchemasApacheDS";
/** The File Dialog path for 'Import Schema Projects' */
- public static final String FILE_DIALOG_IMPORT_PROJECTS = Activator.PLUGIN_ID + ".fileDialog.importProjects";
+ public static final String FILE_DIALOG_IMPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.importProjects";
/** The File Dialog path for 'Import Schemas from OpenLDAP files' */
- public static final String FILE_DIALOG_IMPORT_SCHEMAS_OPENLDAP = Activator.PLUGIN_ID
+ public static final String FILE_DIALOG_IMPORT_SCHEMAS_OPENLDAP = PluginConstants.PLUGIN_ID
+ ".fileDialog.importSchemasOpenLDAP";
/** The File Dialog path for 'Import Schemas from XML files' */
- public static final String FILE_DIALOG_IMPORT_SCHEMAS_XML = Activator.PLUGIN_ID + ".fileDialog.importSchemasXML";
+ public static final String FILE_DIALOG_IMPORT_SCHEMAS_XML = PluginConstants.PLUGIN_ID
+ + ".fileDialog.importSchemasXML";
// Dialog Settings
- public static final String DIALOG_SETTINGS_OID_HISTORY = Activator.PLUGIN_ID + ".dialogSettings.oidHistory";
+ public static final String DIALOG_SETTINGS_OID_HISTORY = PluginConstants.PLUGIN_ID + ".dialogSettings.oidHistory";
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Fri Aug 29 07:13:53 2008
@@ -344,7 +344,7 @@
try
{
- URL url = Platform.getBundle( Activator.PLUGIN_ID ).getResource(
+ URL url = Activator.getDefault().getBundle().getResource(
"resources/schemas/" + getFolderName( serverType ) + "/" + schemaName + ".xml" );
if ( url == null )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Perspective.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Perspective.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Perspective.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/Perspective.java Fri Aug 29 07:13:53 2008
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view;
-import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.views.HierarchyView;
import org.apache.directory.studio.schemaeditor.view.views.ProblemsView;
import org.apache.directory.studio.schemaeditor.view.views.ProjectsView;
@@ -46,13 +46,13 @@
public class Perspective implements IPerspectiveFactory
{
/** The ID of the view */
- public static final String ID = Activator.PLUGIN_ID + ".perspective"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.PERSPECTIVE_SCHEMA_EDITOR_ID;
/** The ID of the top left folder */
- public static final String topLeftFolderId = "org.apache.directory.studio.schemaeditor.topleftfolder"; //$NON-NLS-1$
+ public static final String topLeftFolderId = PluginConstants.PERSPECTIVE_TOP_LEFT_FOLDER_ID;
/** The ID of the bottom folder */
- public static final String bottomFolderId = "org.apache.directory.studio.schemaeditor.bottomfolder"; //$NON-NLS-1$
+ public static final String bottomFolderId = PluginConstants.PERSPECTIVE_BOTTOM_FOLDER_ID;
/* (non-Javadoc)
@@ -82,7 +82,7 @@
layout.getViewLayout( ProjectsView.ID ).setCloseable( false );
// Adding Perspective shortcuts
- layout.addPerspectiveShortcut( "org.apache.directory.studio.ldapbrowser.ui.perspective.BrowserPerspective" ); //$NON-NLS-1$
+ layout.addPerspectiveShortcut( PluginConstants.PERSPECTIVE_LDAP_BROWSER_ID );
layout.addPerspectiveShortcut( Perspective.ID );
// Adding View shortcuts
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.AttributeTypeAdapter;
import org.apache.directory.studio.schemaeditor.controller.AttributeTypeListener;
@@ -54,7 +55,7 @@
private static Logger logger = Logger.getLogger( AttributeTypeEditor.class );
/** The ID of the Editor */
- public static final String ID = Activator.PLUGIN_ID + ".view.attributeTypeEditor"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.EDITOR_ATTRIBUTE_TYPE_ID;
/** The editor */
private AttributeTypeEditor instance;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Fri Aug 29 07:13:53 2008
@@ -24,6 +24,7 @@
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -671,7 +672,7 @@
addListeners();
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "attribute_type_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "attribute_type_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Fri Aug 29 07:13:53 2008
@@ -27,7 +27,7 @@
import org.apache.directory.shared.ldap.schema.parser.AttributeTypeLiteral;
import org.apache.directory.shared.ldap.schema.parser.OpenLdapSchemaParser;
-import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
@@ -150,7 +150,7 @@
schemaSourceViewer.getTextWidget().addModifyListener( schemaSourceViewerListener );
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "attribute_type_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "attribute_type_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
@@ -245,7 +246,7 @@
addListeners();
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "attribute_type_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "attribute_type_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditor.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.ObjectClassAdapter;
import org.apache.directory.studio.schemaeditor.controller.ObjectClassListener;
@@ -52,7 +53,7 @@
private static Logger logger = Logger.getLogger( ObjectClassEditor.class );
/** The ID of the Editor */
- public static final String ID = Activator.PLUGIN_ID + ".view.objectClassEditor"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.EDITOR_OBJECT_CLASS_ID;
/** The editor */
private ObjectClassEditor instance;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Fri Aug 29 07:13:53 2008
@@ -27,6 +27,7 @@
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -856,7 +857,7 @@
addListeners();
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "object_class_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "object_class_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Fri Aug 29 07:13:53 2008
@@ -27,7 +27,7 @@
import org.apache.directory.shared.ldap.schema.parser.ObjectClassLiteral;
import org.apache.directory.shared.ldap.schema.parser.OpenLdapSchemaParser;
-import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
import org.apache.directory.studio.schemaeditor.view.widget.SchemaSourceViewer;
@@ -148,7 +148,7 @@
schemaSourceViewer.getTextWidget().addModifyListener( schemaSourceViewerListener );
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "object_class_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "object_class_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditor.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -45,7 +46,7 @@
private static Logger logger = Logger.getLogger( SchemaEditor.class );
/** The ID of the Editor */
- public static final String ID = Activator.PLUGIN_ID + ".view.schemaEditor"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.EDITOR_SCHEMA_ID;
/** The editor */
private SchemaEditor instance;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.SchemaAdapter;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -228,7 +229,7 @@
addListeners();
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "schema_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "schema_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaListener;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
@@ -223,7 +224,7 @@
addListeners();
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( form, Activator.PLUGIN_ID + "." + "schema_editor" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( form, PluginConstants.PLUGIN_ID + "." + "schema_editor" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/HierarchyViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/HierarchyViewPreferencePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/HierarchyViewPreferencePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/HierarchyViewPreferencePage.java Fri Aug 29 07:13:53 2008
@@ -52,7 +52,7 @@
public class HierarchyViewPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
/** The preference page ID */
- public static final String ID = Activator.PLUGIN_ID + ".preferences.hierarchyView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.PREF_PAGE_HIERARCHY_VIEW_ID;
/** The First Name category */
private static final String FIRST_NAME = "First Name";
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SchemaViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SchemaViewPreferencePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SchemaViewPreferencePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SchemaViewPreferencePage.java Fri Aug 29 07:13:53 2008
@@ -51,7 +51,7 @@
public class SchemaViewPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
/** The preference page ID */
- public static final String ID = Activator.PLUGIN_ID + ".preferences.schemaView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.PREF_PAGE_SCHEMA_VIEW_ID;
/** The First Name category */
private static final String FIRST_NAME = "First Name";
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SearchViewPreferencePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SearchViewPreferencePage.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SearchViewPreferencePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/preferences/SearchViewPreferencePage.java Fri Aug 29 07:13:53 2008
@@ -51,7 +51,7 @@
public class SearchViewPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
{
/** The preference page ID */
- public static final String ID = Activator.PLUGIN_ID + ".preferences.searchView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.PREF_PAGE_SEARCH_VIEW_ID;
/** The First Name category */
private static final String FIRST_NAME = "First Name";
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Fri Aug 29 07:13:53 2008
@@ -22,6 +22,7 @@
import org.apache.directory.shared.ldap.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.HierarchyViewController;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -46,7 +47,7 @@
public class HierarchyView extends ViewPart
{
/** The view's ID */
- public static final String ID = Activator.PLUGIN_ID + ".view.HierarchyView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.VIEW_HIERARCHY_VIEW_ID;
/** The tree viewer */
private TreeViewer viewer;
@@ -88,7 +89,7 @@
controller = new HierarchyViewController( this );
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID + "." + "hierarchy_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "hierarchy_view" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java Fri Aug 29 07:13:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.ProblemsViewController;
import org.apache.directory.studio.schemaeditor.model.schemachecker.SchemaChecker;
import org.apache.directory.studio.schemaeditor.view.wrappers.ProblemsViewRoot;
@@ -47,7 +48,7 @@
public class ProblemsView extends ViewPart
{
/** The ID of the View */
- public static final String ID = Activator.PLUGIN_ID + ".view.ProblemsView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.VIEW_PROBLEMS_VIEW_ID;
/** The viewer */
private TreeViewer treeViewer;
@@ -71,7 +72,7 @@
public void createPartControl( Composite parent )
{
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID + "." + "problems_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "problems_view" );
GridLayout gridLayout = new GridLayout();
gridLayout.horizontalSpacing = 0;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java Fri Aug 29 07:13:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.ProjectsViewController;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.TableViewer;
@@ -40,7 +41,7 @@
public class ProjectsView extends ViewPart
{
/** The ID of the View */
- public static final String ID = Activator.PLUGIN_ID + ".view.ProjectsView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.VIEW_PROJECTS_VIEW_ID;
/** The viewer */
private TableViewer tableViewer;
@@ -52,7 +53,7 @@
public void createPartControl( Composite parent )
{
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID + "." + "projects_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "projects_view" );
initViewer( parent );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java Fri Aug 29 07:13:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaViewController;
import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaViewRoot;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
@@ -42,7 +43,7 @@
public class SchemaView extends ViewPart
{
/** The ID of the View */
- public static final String ID = Activator.PLUGIN_ID + ".view.SchemaView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.VIEW_SCHEMA_VIEW_ID;
/** The viewer */
private TreeViewer treeViewer;
@@ -62,7 +63,7 @@
new SchemaViewController( this );
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID + "." + "schema_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "schema_view" );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Fri Aug 29 07:13:53 2008
@@ -83,7 +83,7 @@
public class SearchView extends ViewPart
{
/** The view's ID */
- public static final String ID = Activator.PLUGIN_ID + ".view.SearchView"; //$NON-NLS-1$
+ public static final String ID = PluginConstants.VIEW_SEARCH_VIEW_ID;
/** The current Search String */
private String searchString;
@@ -109,7 +109,7 @@
public void createPartControl( Composite parent )
{
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, Activator.PLUGIN_ID + "." + "search_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "search_view" );
this.parent = parent;
GridLayout gridLayout = new GridLayout();
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/CommitChangesWizard.java Fri Aug 29 07:13:53 2008
@@ -44,9 +44,6 @@
*/
public class CommitChangesWizard extends Wizard implements IExportWizard
{
- /** The wizard's ID */
- public static final String ID = Activator.PLUGIN_ID + ".wizards.CommitChangesWizard";
-
/** The flag to know if the Schema contains errors */
private boolean schemaContainsErrors = false;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java Fri Aug 29 07:13:53 2008
@@ -26,7 +26,6 @@
import java.io.UnsupportedEncodingException;
import java.lang.reflect.InvocationTargetException;
-import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.model.Project;
import org.apache.directory.studio.schemaeditor.model.io.ProjectsExporter;
@@ -49,8 +48,6 @@
*/
public class ExportProjectsWizard extends Wizard implements IExportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportProjectsWizard";
-
/** The selected projects */
private Project[] selectedProjects = new Project[0];
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java Fri Aug 29 07:13:53 2008
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
@@ -46,8 +45,6 @@
*/
public class ExportSchemasAsOpenLdapWizard extends Wizard implements IExportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportSchemasAsOpenLdapWizard";
-
/** The selected schemas */
private Schema[] selectedSchemas = new Schema[0];
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java Fri Aug 29 07:13:53 2008
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.model.Schema;
import org.apache.directory.studio.schemaeditor.model.io.XMLSchemaFileExporter;
@@ -46,8 +45,6 @@
*/
public class ExportSchemasAsXmlWizard extends Wizard implements IExportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportSchemasAsXmlWizard";
-
/** The selected schemas */
private Schema[] selectedSchemas = new Schema[0];
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Fri Aug 29 07:13:53 2008
@@ -58,8 +58,6 @@
*/
public class ExportSchemasForADSWizard extends Wizard implements IExportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ExportSchemasForADSWizard";
-
/** The selected schemas */
private Schema[] selectedSchemas = new Schema[0];
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportCoreSchemasWizard.java Fri Aug 29 07:13:53 2008
@@ -40,8 +40,6 @@
*/
public class ImportCoreSchemasWizard extends Wizard implements IImportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportCoreSchemasWizard";
-
// The pages of the wizard
private ImportCoreSchemasWizardPage page;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportProjectsWizard.java Fri Aug 29 07:13:53 2008
@@ -48,8 +48,6 @@
*/
public class ImportProjectsWizard extends Wizard implements IImportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportProjectsWizard";
-
// The pages of the wizard
private ImportProjectsWizardPage page;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromOpenLdapWizard.java Fri Aug 29 07:13:53 2008
@@ -49,8 +49,6 @@
*/
public class ImportSchemasFromOpenLdapWizard extends Wizard implements IImportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportSchemasFromOpenLdapWizard";
-
/** The SchemaHandler */
private SchemaHandler schemaHandler;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ImportSchemasFromXmlWizard.java Fri Aug 29 07:13:53 2008
@@ -50,8 +50,6 @@
*/
public class ImportSchemasFromXmlWizard extends Wizard implements IImportWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.ImportSchemasFromXmlWizard";
-
/** The SchemaHandler */
private SchemaHandler schemaHandler;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java Fri Aug 29 07:13:53 2008
@@ -39,7 +39,7 @@
*/
public class NewAttributeTypeWizard extends Wizard implements INewWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.NewAttributeTypeWizard";
+ public static final String ID = PluginConstants.NEW_WIZARD_NEW_ATTRIBUTE_TYPE_WIZARD;
/** The selected schema */
private Schema selectedSchema;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassWizard.java Fri Aug 29 07:13:53 2008
@@ -39,7 +39,7 @@
*/
public class NewObjectClassWizard extends Wizard implements INewWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.NewObjectClassWizard";
+ public static final String ID = PluginConstants.NEW_WIZARD_NEW_OBJECT_CLASS_WIZARD;
/** The selected schema */
private Schema selectedSchema;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java Fri Aug 29 07:13:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
import org.apache.directory.studio.schemaeditor.controller.ProjectsHandler;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -43,15 +44,15 @@
*/
public class NewProjectWizard extends Wizard implements INewWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.NewProjectWizard";
+ public static final String ID = PluginConstants.NEW_WIZARD_NEW_PROJECT_WIZARD;
// The pages of the wizard
private NewProjectWizardInformationPage informationPage;
-// private NewProjectWizardConnectionSelectionPage connectionSelectionPage;
+ // private NewProjectWizardConnectionSelectionPage connectionSelectionPage;
private NewProjectWizardSchemasSelectionPage schemasSelectionPage;
-// private Throwable exceptionThrown = null;
+ // private Throwable exceptionThrown = null;
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#addPages()
@@ -60,12 +61,12 @@
{
// Creating pages
informationPage = new NewProjectWizardInformationPage();
-// connectionSelectionPage = new NewProjectWizardConnectionSelectionPage();
+ // connectionSelectionPage = new NewProjectWizardConnectionSelectionPage();
schemasSelectionPage = new NewProjectWizardSchemasSelectionPage();
// Adding pages
addPage( informationPage );
-// addPage( connectionSelectionPage );
+ // addPage( connectionSelectionPage );
addPage( schemasSelectionPage );
}
@@ -81,108 +82,108 @@
// Creating the project
final Project project = new Project( projectType, projectName );
-// if ( projectType.equals( ProjectType.ONLINE ) )
-// // Project is an "Online Project"
-// {
-// // Setting the connection to use
-// project.setConnection( connectionSelectionPage.getSelectedConnection() );
-//
-// // Reseting the Exception Thrown
-// exceptionThrown = null;
-//
-// try
-// {
-// getContainer().run( false, false, new IRunnableWithProgress()
-// {
-// public void run( IProgressMonitor monitor )
-// {
-// StudioProgressMonitor studioProgressMonitor = new StudioProgressMonitor( monitor );
-//
-// // Getting the correct SchemaConnector for this connection
-// List<SchemaConnector> correctSchemaConnectors = getCorrectSchemaConnectors( project
-// .getConnection(), studioProgressMonitor );
-//
-// // If no suitable SchemaConnector has been found, we display an
-// // error message and return false;
-// if ( correctSchemaConnectors.size() == 0 )
-// {
-// studioProgressMonitor.reportError(
-// "No suitable SchemaConnector has been found for the choosen Directory Server.",
-// new NoSuitableSchemaConnectorException() );
-// }
-//
-// // Getting the correct SchemaConnector
-// SchemaConnector correctSchemaConnector = null;
-// if ( correctSchemaConnectors.size() == 1 )
-// {
-// correctSchemaConnector = correctSchemaConnectors.get( 0 );
-// }
-// else
-// {
-// // TODO display a dialog in which the user can select the correct schema connector
-// }
-//
-// project.setSchemaConnector( correctSchemaConnector );
-//
-// // Fetching the Online Schema
-// project.fetchOnlineSchema( new StudioProgressMonitor( monitor ) );
-//
-// // Checking if an error has occured
-// if ( studioProgressMonitor.errorsReported() )
-// {
-// exceptionThrown = studioProgressMonitor.getException();
-// return;
-// }
-// }
-// } );
-// }
-// catch ( InvocationTargetException e )
-// {
-// // Nothing to do (it will never occur)
-// }
-// catch ( InterruptedException e )
-// {
-// // Nothing to do.
-// }
-//
-// if ( exceptionThrown != null )
-// {
-// if ( exceptionThrown instanceof NoSuitableSchemaConnectorException )
-// // Special case for the 'NoSuitableSchemaConnectorException'
-// {
-// PluginUtils.logError( "No suitable SchemaConnector has been found for the selected connection.",
-// exceptionThrown );
-// ViewUtils.displayErrorMessageBox( "Error", "An error occured when creating the project.\n"
-// + "No suitable SchemaConnector has been found for the selected connection." );
-// }
-// else
-// // Standard case
-// {
-// PluginUtils.logError( "An error occured when creating the project.", exceptionThrown );
-// ViewUtils.displayErrorMessageBox( "Error", "An error occured when creating the project." );
-// }
-// return false;
-// }
-// }
-// else if ( projectType.equals( ProjectType.OFFLINE ) )
-// // Project is an "Offline Project"
-// {
- // Getting the selected 'core' schemas
- String[] selectedSchemas = schemasSelectionPage.getSelectedSchemas();
- ServerTypeEnum serverType = schemasSelectionPage.getServerType();
- if ( ( selectedSchemas != null ) && ( serverType != null ) )
+ // if ( projectType.equals( ProjectType.ONLINE ) )
+ // // Project is an "Online Project"
+ // {
+ // // Setting the connection to use
+ // project.setConnection( connectionSelectionPage.getSelectedConnection() );
+ //
+ // // Reseting the Exception Thrown
+ // exceptionThrown = null;
+ //
+ // try
+ // {
+ // getContainer().run( false, false, new IRunnableWithProgress()
+ // {
+ // public void run( IProgressMonitor monitor )
+ // {
+ // StudioProgressMonitor studioProgressMonitor = new StudioProgressMonitor( monitor );
+ //
+ // // Getting the correct SchemaConnector for this connection
+ // List<SchemaConnector> correctSchemaConnectors = getCorrectSchemaConnectors( project
+ // .getConnection(), studioProgressMonitor );
+ //
+ // // If no suitable SchemaConnector has been found, we display an
+ // // error message and return false;
+ // if ( correctSchemaConnectors.size() == 0 )
+ // {
+ // studioProgressMonitor.reportError(
+ // "No suitable SchemaConnector has been found for the choosen Directory Server.",
+ // new NoSuitableSchemaConnectorException() );
+ // }
+ //
+ // // Getting the correct SchemaConnector
+ // SchemaConnector correctSchemaConnector = null;
+ // if ( correctSchemaConnectors.size() == 1 )
+ // {
+ // correctSchemaConnector = correctSchemaConnectors.get( 0 );
+ // }
+ // else
+ // {
+ // // TODO display a dialog in which the user can select the correct schema connector
+ // }
+ //
+ // project.setSchemaConnector( correctSchemaConnector );
+ //
+ // // Fetching the Online Schema
+ // project.fetchOnlineSchema( new StudioProgressMonitor( monitor ) );
+ //
+ // // Checking if an error has occured
+ // if ( studioProgressMonitor.errorsReported() )
+ // {
+ // exceptionThrown = studioProgressMonitor.getException();
+ // return;
+ // }
+ // }
+ // } );
+ // }
+ // catch ( InvocationTargetException e )
+ // {
+ // // Nothing to do (it will never occur)
+ // }
+ // catch ( InterruptedException e )
+ // {
+ // // Nothing to do.
+ // }
+ //
+ // if ( exceptionThrown != null )
+ // {
+ // if ( exceptionThrown instanceof NoSuitableSchemaConnectorException )
+ // // Special case for the 'NoSuitableSchemaConnectorException'
+ // {
+ // PluginUtils.logError( "No suitable SchemaConnector has been found for the selected connection.",
+ // exceptionThrown );
+ // ViewUtils.displayErrorMessageBox( "Error", "An error occured when creating the project.\n"
+ // + "No suitable SchemaConnector has been found for the selected connection." );
+ // }
+ // else
+ // // Standard case
+ // {
+ // PluginUtils.logError( "An error occured when creating the project.", exceptionThrown );
+ // ViewUtils.displayErrorMessageBox( "Error", "An error occured when creating the project." );
+ // }
+ // return false;
+ // }
+ // }
+ // else if ( projectType.equals( ProjectType.OFFLINE ) )
+ // // Project is an "Offline Project"
+ // {
+ // Getting the selected 'core' schemas
+ String[] selectedSchemas = schemasSelectionPage.getSelectedSchemas();
+ ServerTypeEnum serverType = schemasSelectionPage.getServerType();
+ if ( ( selectedSchemas != null ) && ( serverType != null ) )
+ {
+ SchemaHandler schemaHandler = project.getSchemaHandler();
+ for ( String selectedSchema : selectedSchemas )
{
- SchemaHandler schemaHandler = project.getSchemaHandler();
- for ( String selectedSchema : selectedSchemas )
+ Schema schema = PluginUtils.loadCoreSchema( serverType, selectedSchema );
+ if ( schema != null )
{
- Schema schema = PluginUtils.loadCoreSchema( serverType, selectedSchema );
- if ( schema != null )
- {
- schemaHandler.addSchema( schema );
- }
+ schemaHandler.addSchema( schema );
}
}
-// }
+ }
+ // }
ProjectsHandler projectsHandler = Activator.getDefault().getProjectsHandler();
projectsHandler.addProject( project );
@@ -192,69 +193,66 @@
}
-// /**
-// * Gets the List of suitable SchemaConnectors
-// *
-// * @param connection
-// * the connection to test the SchemaConnectors with
-// * @return
-// * the List of suitable SchemaConnectors
-// */
-// private List<SchemaConnector> getCorrectSchemaConnectors( Connection connection, StudioProgressMonitor monitor )
-// {
-// List<SchemaConnector> suitableSchemaConnectors = new ArrayList<SchemaConnector>();
-//
-// // Looping on the SchemaConnectors
-// List<SchemaConnector> schemaConectors = PluginUtils.getSchemaConnectors();
-// for ( SchemaConnector schemaConnector : schemaConectors )
-// {
-// // Testing if the SchemaConnector is suitable for this connection
-// if ( schemaConnector.isSuitableConnector( connection, monitor ) )
-// {
-// suitableSchemaConnectors.add( schemaConnector );
-// }
-// }
-//
-// return suitableSchemaConnectors;
-// }
-
-
-// /* (non-Javadoc)
-// * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
-// */
-// public IWizardPage getNextPage( IWizardPage page )
-// {
-// if ( page.equals( informationPage ) )
-// {
-// if ( informationPage.getProjectType().equals( ProjectType.ONLINE ) )
-// {
-// return connectionSelectionPage;
-// }
-// else if ( informationPage.getProjectType().equals( ProjectType.OFFLINE ) )
-// {
-// return schemasSelectionPage;
-// }
-// }
-//
-// // Default
-// return null;
-// }
-
-
-// /* (non-Javadoc)
-// * @see org.eclipse.jface.wizard.Wizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage)
-// */
-// public IWizardPage getPreviousPage( IWizardPage page )
-// {
-// if ( ( page.equals( connectionSelectionPage ) ) || ( page.equals( schemasSelectionPage ) ) )
-// {
-// return informationPage;
-// }
-//
-// // Default
-// return null;
-// }
-
+ // /**
+ // * Gets the List of suitable SchemaConnectors
+ // *
+ // * @param connection
+ // * the connection to test the SchemaConnectors with
+ // * @return
+ // * the List of suitable SchemaConnectors
+ // */
+ // private List<SchemaConnector> getCorrectSchemaConnectors( Connection connection, StudioProgressMonitor monitor )
+ // {
+ // List<SchemaConnector> suitableSchemaConnectors = new ArrayList<SchemaConnector>();
+ //
+ // // Looping on the SchemaConnectors
+ // List<SchemaConnector> schemaConectors = PluginUtils.getSchemaConnectors();
+ // for ( SchemaConnector schemaConnector : schemaConectors )
+ // {
+ // // Testing if the SchemaConnector is suitable for this connection
+ // if ( schemaConnector.isSuitableConnector( connection, monitor ) )
+ // {
+ // suitableSchemaConnectors.add( schemaConnector );
+ // }
+ // }
+ //
+ // return suitableSchemaConnectors;
+ // }
+
+ // /* (non-Javadoc)
+ // * @see org.eclipse.jface.wizard.Wizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
+ // */
+ // public IWizardPage getNextPage( IWizardPage page )
+ // {
+ // if ( page.equals( informationPage ) )
+ // {
+ // if ( informationPage.getProjectType().equals( ProjectType.ONLINE ) )
+ // {
+ // return connectionSelectionPage;
+ // }
+ // else if ( informationPage.getProjectType().equals( ProjectType.OFFLINE ) )
+ // {
+ // return schemasSelectionPage;
+ // }
+ // }
+ //
+ // // Default
+ // return null;
+ // }
+
+ // /* (non-Javadoc)
+ // * @see org.eclipse.jface.wizard.Wizard#getPreviousPage(org.eclipse.jface.wizard.IWizardPage)
+ // */
+ // public IWizardPage getPreviousPage( IWizardPage page )
+ // {
+ // if ( ( page.equals( connectionSelectionPage ) ) || ( page.equals( schemasSelectionPage ) ) )
+ // {
+ // return informationPage;
+ // }
+ //
+ // // Default
+ // return null;
+ // }
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.Wizard#canFinish()
@@ -271,10 +269,10 @@
{
return true;
}
-// else if ( currentPage.equals( connectionSelectionPage ) )
-// {
-// return connectionSelectionPage.isPageComplete();
-// }
+ // else if ( currentPage.equals( connectionSelectionPage ) )
+ // {
+ // return connectionSelectionPage.isPageComplete();
+ // }
else
{
return false;
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java?rev=690266&r1=690265&r2=690266&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewSchemaWizard.java Fri Aug 29 07:13:53 2008
@@ -21,6 +21,7 @@
import org.apache.directory.studio.schemaeditor.Activator;
+import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.SchemaImpl;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
@@ -36,7 +37,7 @@
*/
public class NewSchemaWizard extends Wizard implements INewWizard
{
- public static final String ID = Activator.PLUGIN_ID + ".wizards.NewSchemaWizard";
+ public static final String ID = PluginConstants.NEW_WIZARD_NEW_SCHEMA_WIZARD;
// The pages of the wizard
private NewSchemaWizardPage page;