directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1433564 [1/2] - in /directory/studio/trunk/plugins/schemaeditor/src: main/java/org/apache/directory/studio/schemaeditor/ main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/ main/java/org/apache/directory/studio/schemaeditor...
Date Tue, 15 Jan 2013 18:21:25 GMT
Author: pamarcelot
Date: Tue Jan 15 18:21:24 2013
New Revision: 1433564

URL: http://svn.apache.org/viewvc?rev=1433564&view=rev
Log:
Externalized and translated strings.

Modified:
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
    directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java
    directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginConstants.java Tue Jan 15 18:21:24 2013
@@ -43,186 +43,186 @@ public final class PluginConstants
     }
 
     /** The plug-in ID */
-    public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" );
+    public static final String PLUGIN_ID = Activator.getDefault().getPluginProperties().getString( "Plugin_id" ); //$NON-NLS-1$
 
     /** The Schema Editor perspective ID */
     public static final String PERSPECTIVE_SCHEMA_EDITOR_ID = Activator.getDefault().getPluginProperties().getString(
-        "Perspective_SchemaEditor_id" );
+        "Perspective_SchemaEditor_id" ); //$NON-NLS-1$
 
     /** The LDAP Browser perspective ID */
     public static final String PERSPECTIVE_LDAP_BROWSER_ID = Activator.getDefault().getPluginProperties().getString(
-        "Perspective_LdapBrowser_id" );
+        "Perspective_LdapBrowser_id" ); //$NON-NLS-1$
 
     /** The top left folder ID */
     public static final String PERSPECTIVE_TOP_LEFT_FOLDER_ID = Activator.getDefault().getPluginProperties().getString(
-        "Perspective_TopLeftFolder_id" );
+        "Perspective_TopLeftFolder_id" ); //$NON-NLS-1$
 
     /** The bottom folder ID */
     public static final String PERSPECTIVE_BOTTOM_FOLDER_ID = Activator.getDefault().getPluginProperties().getString(
-        "Perspective_BottomFolder_id" );
+        "Perspective_BottomFolder_id" ); //$NON-NLS-1$
 
     /** The Attribute Type Editor ID */
     public static final String EDITOR_ATTRIBUTE_TYPE_ID = Activator.getDefault().getPluginProperties().getString(
-        "Editor_AttributeTypeEditor_id" );
+        "Editor_AttributeTypeEditor_id" ); //$NON-NLS-1$
 
     /** The Object Class Editor ID */
     public static final String EDITOR_OBJECT_CLASS_ID = Activator.getDefault().getPluginProperties().getString(
-        "Editor_ObjectClassEditor_id" );
+        "Editor_ObjectClassEditor_id" ); //$NON-NLS-1$
 
     /** The Schema Editor ID */
     public static final String EDITOR_SCHEMA_ID = Activator.getDefault().getPluginProperties().getString(
-        "Editor_SchemaEditor_id" );
+        "Editor_SchemaEditor_id" ); //$NON-NLS-1$
 
     /** The Hierarchy View Preference Page ID */
     public static final String PREF_PAGE_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "PrefPage_HierarchyView_id" );
+        "PrefPage_HierarchyView_id" ); //$NON-NLS-1$
 
     /** The Schema View Preference Page ID */
     public static final String PREF_PAGE_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "PrefPage_SchemaView_id" );
+        "PrefPage_SchemaView_id" ); //$NON-NLS-1$
 
     /** The Search View Preference Page ID */
     public static final String PREF_PAGE_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "PrefPage_SearchView_id" );
+        "PrefPage_SearchView_id" ); //$NON-NLS-1$
 
     /** The Hierarchy View ID */
     public static final String VIEW_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "View_HierarchyView_id" );
+        "View_HierarchyView_id" ); //$NON-NLS-1$
 
     /** The Problems View ID */
     public static final String VIEW_PROBLEMS_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "View_ProblemsView_id" );
+        "View_ProblemsView_id" ); //$NON-NLS-1$
 
     /** The Projects View ID */
     public static final String VIEW_PROJECTS_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "View_ProjectsView_id" );
+        "View_ProjectsView_id" ); //$NON-NLS-1$
 
     /** The Schema View ID */
     public static final String VIEW_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "View_SchemaView_id" );
+        "View_SchemaView_id" ); //$NON-NLS-1$
 
     /** The Search View ID */
     public static final String VIEW_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties().getString(
-        "View_SearchView_id" );
+        "View_SearchView_id" ); //$NON-NLS-1$
 
     /** The New Attribute Type Wizard ID */
     public static final String NEW_WIZARD_NEW_ATTRIBUTE_TYPE_WIZARD = Activator.getDefault().getPluginProperties()
-        .getString( "NewWizard_NewAttributeTypeWizard_id" );
+        .getString( "NewWizard_NewAttributeTypeWizard_id" ); //$NON-NLS-1$
 
     /** The New Object Class Wizard ID */
     public static final String NEW_WIZARD_NEW_OBJECT_CLASS_WIZARD = Activator.getDefault().getPluginProperties()
-        .getString( "NewWizard_NewObjectClassWizard_id" );
+        .getString( "NewWizard_NewObjectClassWizard_id" ); //$NON-NLS-1$
 
     /** The New Project Wizard ID */
     public static final String NEW_WIZARD_NEW_PROJECT_WIZARD = Activator.getDefault().getPluginProperties().getString(
-        "NewWizard_NewProjectWizard_id" );
+        "NewWizard_NewProjectWizard_id" ); //$NON-NLS-1$
 
     /** The New Schema Wizard ID */
     public static final String NEW_WIZARD_NEW_SCHEMA_WIZARD = Activator.getDefault().getPluginProperties().getString(
-        "NewWizard_NewSchemaWizard_id" );
+        "NewWizard_NewSchemaWizard_id" ); //$NON-NLS-1$
 
     // 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";
-    public static final String IMG_ATTRIBUTE_TYPE_NEW = "resources/icons/attribute_type_new.gif";
-    public static final String IMG_ATTRIBUTE_TYPE_NEW_WIZARD = "resources/icons/attribute_type_new_wizard.png";
-    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION = "resources/icons/attribute_type_overlay_operation.gif";
-    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_USER_APPLICATION = "resources/icons/attribute_type_overlay_userApplication.gif";
-    public static final String IMG_CONNECT = "resources/icons/connect.gif";
-    public static final String IMG_COMMIT_CHANGES = "resources/icons/commit_changes.gif";
-    public static final String IMG_COMMIT_CHANGES_WIZARD = "resources/icons/commit_changes_wizard.png";
-    public static final String IMG_COLLAPSE_ALL = "resources/icons/collapse_all.gif";
-    public static final String IMG_DELETE = "resources/icons/delete.gif";
-    public static final String IMG_DISCONNECT = "resources/icons/disconnect.gif";
-    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_ADD = "resources/icons/difference_attribute_type_add.gif";
-    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_MODIFY = "resources/icons/difference_attribute_type_modify.gif";
-    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_REMOVE = "resources/icons/difference_attribute_type_remove.gif";
-    public static final String IMG_DIFFERENCE_OBJECT_CLASS_ADD = "resources/icons/difference_object_class_add.gif";
-    public static final String IMG_DIFFERENCE_OBJECT_CLASS_MODIFY = "resources/icons/difference_object_class_modify.gif";
-    public static final String IMG_DIFFERENCE_OBJECT_CLASS_REMOVE = "resources/icons/difference_object_class_remove.gif";
-    public static final String IMG_DIFFERENCE_PROPERTY_ADD = "resources/icons/difference_property_add.gif";
-    public static final String IMG_DIFFERENCE_PROPERTY_MODIFY = "resources/icons/difference_property_modify.gif";
-    public static final String IMG_DIFFERENCE_PROPERTY_REMOVE = "resources/icons/difference_property_remove.gif";
-    public static final String IMG_DIFFERENCE_SCHEMA_ADD = "resources/icons/difference_schema_add.gif";
-    public static final String IMG_DIFFERENCE_SCHEMA_MODIFY = "resources/icons/difference_schema_modify.gif";
-    public static final String IMG_DIFFERENCE_SCHEMA_REMOVE = "resources/icons/difference_schema_remove.gif";
-    public static final String IMG_FOLDER = "resources/icons/folder.gif";
-    public static final String IMG_FOLDER_AT = "resources/icons/folder_at.gif";
-    public static final String IMG_FOLDER_OC = "resources/icons/folder_oc.gif";
-    public static final String IMG_LINK_WITH_EDITOR = "resources/icons/link_with_editor.gif";
-    public static final String IMG_OBJECT_CLASS = "resources/icons/object_class.gif";
-    public static final String IMG_OBJECT_CLASS_HIERARCHY_SELECTED = "resources/icons/object_class_hierarchy_selected.gif";
-    public static final String IMG_OBJECT_CLASS_NEW = "resources/icons/object_class_new.gif";
-    public static final String IMG_OBJECT_CLASS_NEW_WIZARD = "resources/icons/object_class_new_wizard.png";
-    public static final String IMG_OBJECT_CLASS_OVERLAY_ABSTRACT = "resources/icons/object_class_overlay_abstract.gif";
-    public static final String IMG_OBJECT_CLASS_OVERLAY_AUXILIARY = "resources/icons/object_class_overlay_auxiliary.gif";
-    public static final String IMG_OBJECT_CLASS_OVERLAY_STRUCTURAL = "resources/icons/object_class_overlay_structural.gif";
-    public static final String IMG_OVERLAY_ERROR = "resources/icons/overlay_error.gif";
-    public static final String IMG_OVERLAY_WARNING = "resources/icons/overlay_warning.gif";
-    public static final String IMG_PROBLEMS_ERROR = "resources/icons/problems_error.gif";
-    public static final String IMG_PROBLEMS_GROUP = "resources/icons/problems_group.gif";
-    public static final String IMG_PROBLEMS_WARNING = "resources/icons/problems_warning.gif";
-    public static final String IMG_PROJECT_EXPORT = "resources/icons/project_export.gif";
-    public static final String IMG_PROJECT_EXPORT_WIZARD = "resources/icons/project_export_wizard.png";
-    public static final String IMG_PROJECT_FILE = "resources/icons/project_file.gif";
-    public static final String IMG_PROJECT_IMPORT = "resources/icons/project_import.gif";
-    public static final String IMG_PROJECT_IMPORT_WIZARD = "resources/icons/project_import_wizard.png";
-    public static final String IMG_PROJECT_NEW = "resources/icons/project_new.gif";
-    public static final String IMG_PROJECT_NEW_WIZARD = "resources/icons/project_new_wizard.png";
-    public static final String IMG_PROJECT_OFFLINE = "resources/icons/project_offline.gif";
-    public static final String IMG_PROJECT_OFFLINE_CLOSED = "resources/icons/project_offline_closed.gif";
-    public static final String IMG_PROJECT_ONLINE = "resources/icons/project_online.gif";
-    public static final String IMG_PROJECT_ONLINE_CLOSED = "resources/icons/project_online_closed.gif";
-    public static final String IMG_RENAME = "resources/icons/rename.gif";
-    public static final String IMG_RUN_CURRENT_SEARCH_AGAIN = "resources/icons/run_current_search_again.gif";
-    public static final String IMG_SCHEMA = "resources/icons/schema.gif";
-    public static final String IMG_SCHEMA_CONNECTOR = "resources/icons/schema_connector.gif";
-    public static final String IMG_SCHEMA_NEW = "resources/icons/schema_new.gif";
-    public static final String IMG_SCHEMA_NEW_WIZARD = "resources/icons/schema_new_wizard.png";
-    public static final String IMG_SCHEMAS_EXPORT = "resources/icons/schemas_export.gif";
-    public static final String IMG_SCHEMAS_EXPORT_FOR_ADS = "resources/icons/schemas_export_for_ads.gif";
-    public static final String IMG_SCHEMAS_EXPORT_FOR_ADS_WIZARD = "resources/icons/schemas_export_for_ads_wizard.png";
-    public static final String IMG_SCHEMAS_EXPORT_WIZARD = "resources/icons/schemas_export_wizard.png";
-    public static final String IMG_SCHEMAS_IMPORT = "resources/icons/schemas_import.gif";
-    public static final String IMG_SCHEMAS_IMPORT_WIZARD = "resources/icons/schemas_import_wizard.png";
-    public static final String IMG_SEARCH = "resources/icons/search.gif";
-    public static final String IMG_SEARCH_HISTORY_ITEM = "resources/icons/search_history_item.gif";
-    public static final String IMG_SHOW_SEARCH_FIELD = "resources/icons/show_search_field.gif";
-    public static final String IMG_SHOW_SEARCH_HISTORY = "resources/icons/show_search_history.gif";
-    public static final String IMG_SHOW_SUBTYPE_HIERARCHY = "resources/icons/hierarchy_subtype.gif";
-    public static final String IMG_SHOW_SUPERTYPE_HIERARCHY = "resources/icons/hierarchy_supertype.gif";
-    public static final String IMG_SHOW_TYPE_HIERARCHY = "resources/icons/hierarchy_type.gif";
-    public static final String IMG_SORTING = "resources/icons/sorting.gif";
-    public static final String IMG_TOOLBAR_MENU = "resources/icons/toolbar_menu.gif";
-    public static final String IMG_TRANSPARENT_16X16 = "resources/icons/transparent_16x16.gif";
-    public static final String IMG_WARNING_32X32 = "resources/icons/warning_32x32.png";
+    public static final String IMG_ATTRIBUTE_TYPE = "resources/icons/attribute_type.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_HIERARCHY_SELECTED = "resources/icons/attribute_type_hierarchy_selected.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_NEW = "resources/icons/attribute_type_new.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_NEW_WIZARD = "resources/icons/attribute_type_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_OPERATION = "resources/icons/attribute_type_overlay_operation.gif"; //$NON-NLS-1$
+    public static final String IMG_ATTRIBUTE_TYPE_OVERLAY_USER_APPLICATION = "resources/icons/attribute_type_overlay_userApplication.gif"; //$NON-NLS-1$
+    public static final String IMG_CONNECT = "resources/icons/connect.gif"; //$NON-NLS-1$
+    public static final String IMG_COMMIT_CHANGES = "resources/icons/commit_changes.gif"; //$NON-NLS-1$
+    public static final String IMG_COMMIT_CHANGES_WIZARD = "resources/icons/commit_changes_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_COLLAPSE_ALL = "resources/icons/collapse_all.gif"; //$NON-NLS-1$
+    public static final String IMG_DELETE = "resources/icons/delete.gif"; //$NON-NLS-1$
+    public static final String IMG_DISCONNECT = "resources/icons/disconnect.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_ADD = "resources/icons/difference_attribute_type_add.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_MODIFY = "resources/icons/difference_attribute_type_modify.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_ATTRIBUTE_TYPE_REMOVE = "resources/icons/difference_attribute_type_remove.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_OBJECT_CLASS_ADD = "resources/icons/difference_object_class_add.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_OBJECT_CLASS_MODIFY = "resources/icons/difference_object_class_modify.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_OBJECT_CLASS_REMOVE = "resources/icons/difference_object_class_remove.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_PROPERTY_ADD = "resources/icons/difference_property_add.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_PROPERTY_MODIFY = "resources/icons/difference_property_modify.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_PROPERTY_REMOVE = "resources/icons/difference_property_remove.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_SCHEMA_ADD = "resources/icons/difference_schema_add.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_SCHEMA_MODIFY = "resources/icons/difference_schema_modify.gif"; //$NON-NLS-1$
+    public static final String IMG_DIFFERENCE_SCHEMA_REMOVE = "resources/icons/difference_schema_remove.gif"; //$NON-NLS-1$
+    public static final String IMG_FOLDER = "resources/icons/folder.gif"; //$NON-NLS-1$
+    public static final String IMG_FOLDER_AT = "resources/icons/folder_at.gif"; //$NON-NLS-1$
+    public static final String IMG_FOLDER_OC = "resources/icons/folder_oc.gif"; //$NON-NLS-1$
+    public static final String IMG_LINK_WITH_EDITOR = "resources/icons/link_with_editor.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS = "resources/icons/object_class.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_HIERARCHY_SELECTED = "resources/icons/object_class_hierarchy_selected.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_NEW = "resources/icons/object_class_new.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_NEW_WIZARD = "resources/icons/object_class_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_ABSTRACT = "resources/icons/object_class_overlay_abstract.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_AUXILIARY = "resources/icons/object_class_overlay_auxiliary.gif"; //$NON-NLS-1$
+    public static final String IMG_OBJECT_CLASS_OVERLAY_STRUCTURAL = "resources/icons/object_class_overlay_structural.gif"; //$NON-NLS-1$
+    public static final String IMG_OVERLAY_ERROR = "resources/icons/overlay_error.gif"; //$NON-NLS-1$
+    public static final String IMG_OVERLAY_WARNING = "resources/icons/overlay_warning.gif"; //$NON-NLS-1$
+    public static final String IMG_PROBLEMS_ERROR = "resources/icons/problems_error.gif"; //$NON-NLS-1$
+    public static final String IMG_PROBLEMS_GROUP = "resources/icons/problems_group.gif"; //$NON-NLS-1$
+    public static final String IMG_PROBLEMS_WARNING = "resources/icons/problems_warning.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_EXPORT = "resources/icons/project_export.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_EXPORT_WIZARD = "resources/icons/project_export_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_FILE = "resources/icons/project_file.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_IMPORT = "resources/icons/project_import.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_IMPORT_WIZARD = "resources/icons/project_import_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_NEW = "resources/icons/project_new.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_NEW_WIZARD = "resources/icons/project_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_OFFLINE = "resources/icons/project_offline.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_OFFLINE_CLOSED = "resources/icons/project_offline_closed.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_ONLINE = "resources/icons/project_online.gif"; //$NON-NLS-1$
+    public static final String IMG_PROJECT_ONLINE_CLOSED = "resources/icons/project_online_closed.gif"; //$NON-NLS-1$
+    public static final String IMG_RENAME = "resources/icons/rename.gif"; //$NON-NLS-1$
+    public static final String IMG_RUN_CURRENT_SEARCH_AGAIN = "resources/icons/run_current_search_again.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMA = "resources/icons/schema.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMA_CONNECTOR = "resources/icons/schema_connector.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMA_NEW = "resources/icons/schema_new.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMA_NEW_WIZARD = "resources/icons/schema_new_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_EXPORT = "resources/icons/schemas_export.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_EXPORT_FOR_ADS = "resources/icons/schemas_export_for_ads.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_EXPORT_FOR_ADS_WIZARD = "resources/icons/schemas_export_for_ads_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_EXPORT_WIZARD = "resources/icons/schemas_export_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_IMPORT = "resources/icons/schemas_import.gif"; //$NON-NLS-1$
+    public static final String IMG_SCHEMAS_IMPORT_WIZARD = "resources/icons/schemas_import_wizard.png"; //$NON-NLS-1$
+    public static final String IMG_SEARCH = "resources/icons/search.gif"; //$NON-NLS-1$
+    public static final String IMG_SEARCH_HISTORY_ITEM = "resources/icons/search_history_item.gif"; //$NON-NLS-1$
+    public static final String IMG_SHOW_SEARCH_FIELD = "resources/icons/show_search_field.gif"; //$NON-NLS-1$
+    public static final String IMG_SHOW_SEARCH_HISTORY = "resources/icons/show_search_history.gif"; //$NON-NLS-1$
+    public static final String IMG_SHOW_SUBTYPE_HIERARCHY = "resources/icons/hierarchy_subtype.gif"; //$NON-NLS-1$
+    public static final String IMG_SHOW_SUPERTYPE_HIERARCHY = "resources/icons/hierarchy_supertype.gif"; //$NON-NLS-1$
+    public static final String IMG_SHOW_TYPE_HIERARCHY = "resources/icons/hierarchy_type.gif"; //$NON-NLS-1$
+    public static final String IMG_SORTING = "resources/icons/sorting.gif"; //$NON-NLS-1$
+    public static final String IMG_TOOLBAR_MENU = "resources/icons/toolbar_menu.gif"; //$NON-NLS-1$
+    public static final String IMG_TRANSPARENT_16X16 = "resources/icons/transparent_16x16.gif"; //$NON-NLS-1$
+    public static final String IMG_WARNING_32X32 = "resources/icons/warning_32x32.png"; //$NON-NLS-1$
 
     // Commands
     public static final String CMD_DELETE_PROJECT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_DeleteProject_id" );
+        "Cmd_DeleteProject_id" ); //$NON-NLS-1$
     public static final String CMD_DELETE_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_DeleteSchemaElement_id" );
+        "Cmd_DeleteSchemaElement_id" ); //$NON-NLS-1$
     public static final String CMD_OPEN_ELEMENT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_OpenElement_id" );
+        "Cmd_OpenElement_id" ); //$NON-NLS-1$
     public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_OpenTypeHierarchy_id" );
+        "Cmd_OpenTypeHierarchy_id" ); //$NON-NLS-1$
     public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_NewAttributeType_id" );
+        "Cmd_NewAttributeType_id" ); //$NON-NLS-1$
     public static final String CMD_NEW_OBJECT_CLASS = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_NewObjectClass_id" );
+        "Cmd_NewObjectClass_id" ); //$NON-NLS-1$
     public static final String CMD_NEW_PROJECT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_NewProject_id" );
+        "Cmd_NewProject_id" ); //$NON-NLS-1$
     public static final String CMD_NEW_SCHEMA = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_NewSchema_id" );
+        "Cmd_NewSchema_id" ); //$NON-NLS-1$
     public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_RenameProject_id" );
+        "Cmd_RenameProject_id" ); //$NON-NLS-1$
     public static final String CMD_RENAME_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
-        "Cmd_RenameSchemaElement_id" );
+        "Cmd_RenameSchemaElement_id" ); //$NON-NLS-1$
 
     // Preferences - DifferencesWidget
     /** The preferences ID for DifferencesWidget Grouping */
     public static final String PREFS_DIFFERENCES_WIDGET_GROUPING = PluginConstants.PLUGIN_ID
-        + ".prefs.DifferencesWidget.grouping";
+        + ".prefs.DifferencesWidget.grouping"; //$NON-NLS-1$
     /** The preference value for DifferencesWidget Grouping 'Property' */
     public static final int PREFS_DIFFERENCES_WIDGET_GROUPING_PROPERTY = 0;
     /** The preference value for DifferencesWidget Grouping 'Property' */
@@ -422,25 +422,25 @@ public final class PluginConstants
 
     // File Dialogs
     /** The File Dialog path for 'Export Schema Projects' */
-    public static final String FILE_DIALOG_EXPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.exportProjects";
+    public static final String FILE_DIALOG_EXPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.exportProjects"; //$NON-NLS-1$
     /** The File Dialog path for 'Export Schemas to OpenLDAP files' */
     public static final String FILE_DIALOG_EXPORT_SCHEMAS_OPENLDAP = PluginConstants.PLUGIN_ID
-        + ".fileDialog.exportSchemasOpenLDAP";
+        + ".fileDialog.exportSchemasOpenLDAP"; //$NON-NLS-1$
     /** The File Dialog path for 'Export Schemas to XML files' */
     public static final String FILE_DIALOG_EXPORT_SCHEMAS_XML = PluginConstants.PLUGIN_ID
-        + ".fileDialog.exportSchemasXML";
+        + ".fileDialog.exportSchemasXML"; //$NON-NLS-1$
     /** The File Dialog path for 'Export Schemas for ApacheDS' */
     public static final String FILE_DIALOG_EXPORT_SCHEMAS_APACHE_DS = PluginConstants.PLUGIN_ID
-        + ".fileDialog.exportSchemasApacheDS";
+        + ".fileDialog.exportSchemasApacheDS"; //$NON-NLS-1$
     /** The File Dialog path for 'Import Schema Projects' */
-    public static final String FILE_DIALOG_IMPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.importProjects";
+    public static final String FILE_DIALOG_IMPORT_PROJECTS = PluginConstants.PLUGIN_ID + ".fileDialog.importProjects"; //$NON-NLS-1$
     /** The File Dialog path for 'Import Schemas from OpenLDAP files' */
     public static final String FILE_DIALOG_IMPORT_SCHEMAS_OPENLDAP = PluginConstants.PLUGIN_ID
-        + ".fileDialog.importSchemasOpenLDAP";
+        + ".fileDialog.importSchemasOpenLDAP"; //$NON-NLS-1$
     /** The File Dialog path for 'Import Schemas from XML files' */
     public static final String FILE_DIALOG_IMPORT_SCHEMAS_XML = PluginConstants.PLUGIN_ID
-        + ".fileDialog.importSchemasXML";
+        + ".fileDialog.importSchemasXML"; //$NON-NLS-1$
 
     // Dialog Settings
-    public static final String DIALOG_SETTINGS_OID_HISTORY = PluginConstants.PLUGIN_ID + ".dialogSettings.oidHistory";
+    public static final String DIALOG_SETTINGS_OID_HISTORY = PluginConstants.PLUGIN_ID + ".dialogSettings.oidHistory"; //$NON-NLS-1$
 }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/PluginUtils.java Tue Jan 15 18:21:24 2013
@@ -210,16 +210,16 @@ public class PluginUtils
                     }
                     catch ( ProjectsImportException e )
                     {
-                        reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages
-                            .getString( "PluginUtils.ProjectsLoadingError" ), Messages
-                            .getString( "PluginUtils.ErrorLoadingProject" ) );
+                        reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages //$NON-NLS-1$
+                            .getString( "PluginUtils.ProjectsLoadingError" ), Messages //$NON-NLS-1$
+                            .getString( "PluginUtils.ErrorLoadingProject" ) ); //$NON-NLS-1$
                         return;
                     }
                     catch ( FileNotFoundException e )
                     {
-                        reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages
-                            .getString( "PluginUtils.ProjectsLoadingError" ), Messages
-                            .getString( "PluginUtils.ErrorLoadingProject" ) );
+                        reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), e, Messages //$NON-NLS-1$
+                            .getString( "PluginUtils.ProjectsLoadingError" ), Messages //$NON-NLS-1$
+                            .getString( "PluginUtils.ErrorLoadingProject" ) ); //$NON-NLS-1$
                         return;
                     }
 
@@ -231,9 +231,9 @@ public class PluginUtils
                 }
                 else
                 {
-                    reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), null, Messages
-                        .getString( "PluginUtils.ProjectsLoadingError" ), Messages
-                        .getString( "PluginUtils.ErrorLoadingProject" ) );
+                    reportError( Messages.getString( "PluginUtils.ErrorLoadingProject" ), null, Messages //$NON-NLS-1$
+                        .getString( "PluginUtils.ProjectsLoadingError" ), Messages //$NON-NLS-1$
+                        .getString( "PluginUtils.ErrorLoadingProject" ) ); //$NON-NLS-1$
                 }
 
             }
@@ -277,9 +277,9 @@ public class PluginUtils
             catch ( IOException e2 )
             {
                 // If another error occur, we display an error
-                reportError( Messages.getString( "PluginUtils.ErrorSavingProject" ), e2, Messages
-                    .getString( "PluginUtils.ProjectsSavingError" ), Messages
-                    .getString( "PluginUtils.ErrorSavingProject" ) );
+                reportError( Messages.getString( "PluginUtils.ErrorSavingProject" ), e2, Messages //$NON-NLS-1$
+                    .getString( "PluginUtils.ProjectsSavingError" ), Messages //$NON-NLS-1$
+                    .getString( "PluginUtils.ErrorSavingProject" ) ); //$NON-NLS-1$
             }
         }
     }
@@ -348,13 +348,13 @@ public class PluginUtils
         try
         {
             URL url = Activator.getDefault().getBundle().getResource(
-                "resources/schemas/" + getFolderName( serverType ) + "/" + schemaName + ".xml" );
+                "resources/schemas/" + getFolderName( serverType ) + "/" + schemaName + ".xml" ); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
             if ( url == null )
             {
                 reportError(
-                    Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", null, //$NON-NLS-2$
-                    Messages.getString( "PluginUtils.ProjectsLoadingError" ), Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-3$
+                    Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", null,  //$NON-NLS-1$//$NON-NLS-2$
+                    Messages.getString( "PluginUtils.ProjectsLoadingError" ), Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." );  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
             }
             else
             {
@@ -364,20 +364,20 @@ public class PluginUtils
         catch ( XMLSchemaFileImportException e )
         {
             reportError(
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ),//$NON-NLS-2$
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ), //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." );  //$NON-NLS-1$//$NON-NLS-2$
         }
         catch ( FileNotFoundException e )
         {
             reportError(
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ), //$NON-NLS-2$
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ),  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." );  //$NON-NLS-1$//$NON-NLS-2$
         }
         catch ( IOException e )
         {
             reportError(
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ), //$NON-NLS-2$
-                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-2$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + ".", e, Messages.getString( "PluginUtils.ProjectsLoadingError" ),  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+                Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." );  //$NON-NLS-1$//$NON-NLS-2$
         }
 
         return schema;
@@ -469,7 +469,7 @@ public class PluginUtils
         List<SchemaConnector> schemaConnectors = new ArrayList<SchemaConnector>();
 
         IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(
-            Activator.getDefault().getPluginProperties().getString( "ExtensionPoint_SchemaConnectors_id" ) );
+            Activator.getDefault().getPluginProperties().getString( "ExtensionPoint_SchemaConnectors_id" ) ); //$NON-NLS-1$
         IConfigurationElement[] members = extensionPoint.getConfigurationElements();
 
         if ( members != null )
@@ -488,9 +488,9 @@ public class PluginUtils
                 }
                 catch ( CoreException e )
                 {
-                    PluginUtils.logError( Messages.getString( "PluginUtils.ConnectorsLoadingError" ), e );
-                    ViewUtils.displayErrorMessageDialog( Messages.getString( "PluginUtils.Error" ), Messages
-                        .getString( "PluginUtils.ConnectorsLoadingError" ) );
+                    PluginUtils.logError( Messages.getString( "PluginUtils.ConnectorsLoadingError" ), e ); //$NON-NLS-1$
+                    ViewUtils.displayErrorMessageDialog( Messages.getString( "PluginUtils.Error" ), Messages //$NON-NLS-1$
+                        .getString( "PluginUtils.ConnectorsLoadingError" ) ); //$NON-NLS-1$
                 }
             }
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Tue Jan 15 18:21:24 2013
@@ -147,7 +147,7 @@ public class HierarchyManager
         // Then, it is a child of the "top (2.5.6.0)" object class
         // (Unless it is the "top (2.5.6.0)" object class itself)
         {
-            ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" );
+            ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" ); //$NON-NLS-1$
             if ( oc.equals( topOC ) )
             // The given object class is the "top (2.5.6.0)" object class
             {
@@ -165,8 +165,8 @@ public class HierarchyManager
                 else
                 // The "top (2.5.6.0)" object class does not exist
                 {
-                    parentsMap.put( oc, "2.5.6.0" );
-                    childrenMap.put( "2.5.6.0", oc );
+                    parentsMap.put( oc, "2.5.6.0" ); //$NON-NLS-1$
+                    childrenMap.put( "2.5.6.0", oc ); //$NON-NLS-1$
                     childrenMap.put( root, oc );
                 }
             }
@@ -265,7 +265,7 @@ public class HierarchyManager
                 for ( Object value : children )
                 {
                     childrenMap.put( object, value );
-                    if ( oid.equals( "2.5.6.0" ) )
+                    if ( oid.equals( "2.5.6.0" ) ) //$NON-NLS-1$
                     {
                         childrenMap.remove( root, value );
                     }
@@ -477,14 +477,14 @@ public class HierarchyManager
         }
         else
         {
-            if ( oc.getOid().equals( "2.5.6.0" ) )
+            if ( oc.getOid().equals( "2.5.6.0" ) ) //$NON-NLS-1$
             // The given object class is the "top (2.5.6.0)" object class
             {
                 childrenMap.remove( root, oc );
             }
             else
             {
-                ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" );
+                ObjectClass topOC = schemaHandler.getObjectClass( "2.5.6.0" ); //$NON-NLS-1$
                 if ( topOC != null )
                 // The "top (2.5.6.0)" object class exists
                 {
@@ -493,7 +493,7 @@ public class HierarchyManager
                 else
                 // The "top (2.5.6.0)" object class does not exist
                 {
-                    childrenMap.remove( "2.5.6.0", oc );
+                    childrenMap.remove( "2.5.6.0", oc ); //$NON-NLS-1$
                 }
             }
         }
@@ -522,8 +522,8 @@ public class HierarchyManager
                 }
                 else
                 {
-                    parentsMap.put( child, "2.5.6.0" );
-                    childrenMap.put( "2.5.6.0", child );
+                    parentsMap.put( child, "2.5.6.0" ); //$NON-NLS-1$
+                    childrenMap.put( "2.5.6.0", child ); //$NON-NLS-1$
                 }
             }
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Tue Jan 15 18:21:24 2013
@@ -57,16 +57,16 @@ public class ApacheDsSchemaConnector ext
 {
 
     /** The Schema Dn */
-    public static final String SCHEMA_DN = "ou=schema";
+    public static final String SCHEMA_DN = "ou=schema"; //$NON-NLS-1$
 
     /** The name of the metaAttributeType object class */
-    private static final String META_ATTRIBUTE_TYPE = "metaAttributeType";
+    private static final String META_ATTRIBUTE_TYPE = "metaAttributeType"; //$NON-NLS-1$
     /** The name of the metaObjectClass object class */
-    private static final String META_OBJECT_CLASS = "metaObjectClass";
+    private static final String META_OBJECT_CLASS = "metaObjectClass"; //$NON-NLS-1$
     /** The name of the metaMatchingRule object class */
-    private static final String META_MATCHING_RULE = "metaMatchingRule";
+    private static final String META_MATCHING_RULE = "metaMatchingRule"; //$NON-NLS-1$
     /** The name of the metaSyntax object class */
-    private static final String META_SYNTAX = "metaSyntax";
+    private static final String META_SYNTAX = "metaSyntax"; //$NON-NLS-1$
 
     private static final AliasDereferencingMethod DEREF_ALIAS_METHOD = AliasDereferencingMethod.ALWAYS;
     private static final ReferralHandlingMethod HANDLE_REFERALS_METHOD = ReferralHandlingMethod.FOLLOW;
@@ -97,7 +97,7 @@ public class ApacheDsSchemaConnector ext
         constraintSearch.setSearchScope( SearchControls.ONELEVEL_SCOPE );
 
         NamingEnumeration<SearchResult> answer = wrapper
-            .search( "ou=schema", "(objectclass=metaSchema)", constraintSearch, DEREF_ALIAS_METHOD,
+            .search( "ou=schema", "(objectclass=metaSchema)", constraintSearch, DEREF_ALIAS_METHOD, //$NON-NLS-1$ //$NON-NLS-2$
                 HANDLE_REFERALS_METHOD, null, monitor, null );
         if ( answer != null )
         {
@@ -146,7 +146,7 @@ public class ApacheDsSchemaConnector ext
         constraintSearch.setReturningAttributes( new String[]
             { SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES } );
 
-        NamingEnumeration<SearchResult> answer = wrapper.search( "", "(objectclass=*)", constraintSearch,
+        NamingEnumeration<SearchResult> answer = wrapper.search( "", "(objectclass=*)", constraintSearch, //$NON-NLS-1$ //$NON-NLS-2$
             DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
 
         if ( answer != null )
@@ -178,7 +178,7 @@ public class ApacheDsSchemaConnector ext
                         return false;
                     }
 
-                    return ( ( vendorName != null ) && vendorName.equalsIgnoreCase( "Apache Software Foundation" ) );
+                    return ( ( vendorName != null ) && vendorName.equalsIgnoreCase( "Apache Software Foundation" ) ); //$NON-NLS-1$
                 }
             }
             catch ( NamingException e )
@@ -203,7 +203,7 @@ public class ApacheDsSchemaConnector ext
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
-        NamingEnumeration<SearchResult> answer = wrapper.search( "cn=" + name + ", ou=schema", "(objectclass=*)",
+        NamingEnumeration<SearchResult> answer = wrapper.search( "cn=" + name + ", ou=schema", "(objectclass=*)", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             constraintSearch, DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
         if ( answer != null )
         {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Tue Jan 15 18:21:24 2013
@@ -93,7 +93,7 @@ public class GenericSchemaConnector exte
                 SchemaConstants.SYNTAX_CHECKERS_AT
         } );
         String schemaDn = getSubschemaSubentry( wrapper, monitor );
-        NamingEnumeration<SearchResult> answer = wrapper.search( schemaDn, "(objectclass=subschema)", constraintSearch,
+        NamingEnumeration<SearchResult> answer = wrapper.search( schemaDn, "(objectclass=subschema)", constraintSearch, //$NON-NLS-1$
             DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
         if ( answer != null )
         {
@@ -139,7 +139,7 @@ public class GenericSchemaConnector exte
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );
         constraintSearch.setReturningAttributes( new String[]
-            { "subschemaSubentry" } );
+            { "subschemaSubentry" } ); //$NON-NLS-1$
 
         NamingEnumeration<SearchResult> answer = wrapper.search( "", "(objectclass=*)", constraintSearch, //$NON-NLS-1$ //$NON-NLS-2$
             DEREF_ALIAS_METHOD, HANDLE_REFERALS_METHOD, null, monitor, null );
@@ -152,7 +152,7 @@ public class GenericSchemaConnector exte
                 {
                     SearchResult searchResult = answer.next();
 
-                    Attribute subschemaSubentryAttribute = searchResult.getAttributes().get( "subschemaSubentry" );
+                    Attribute subschemaSubentryAttribute = searchResult.getAttributes().get( "subschemaSubentry" ); //$NON-NLS-1$
                     if ( subschemaSubentryAttribute == null )
                     {
                         return null;
@@ -192,7 +192,7 @@ public class GenericSchemaConnector exte
         // The counter for parser exceptions
         int parseErrorCount = 0;
 
-        Attribute attributeTypesAttribute = searchResult.getAttributes().get( "attributeTypes" );
+        Attribute attributeTypesAttribute = searchResult.getAttributes().get( "attributeTypes" ); //$NON-NLS-1$
         if ( attributeTypesAttribute != null )
         {
             NamingEnumeration<?> ne = attributeTypesAttribute.getAll();
@@ -228,7 +228,7 @@ public class GenericSchemaConnector exte
                         // Active Directory hack
                         if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
                         {
-                            impl.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
+                            impl.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" ); //$NON-NLS-1$
                         }
 
                         schema.addAttributeType( impl );
@@ -243,7 +243,7 @@ public class GenericSchemaConnector exte
             }
         }
 
-        Attribute objectClassesAttribute = searchResult.getAttributes().get( "objectClasses" );
+        Attribute objectClassesAttribute = searchResult.getAttributes().get( "objectClasses" ); //$NON-NLS-1$
         if ( objectClassesAttribute != null )
         {
             NamingEnumeration<?> ne = objectClassesAttribute.getAll();
@@ -281,7 +281,7 @@ public class GenericSchemaConnector exte
             }
         }
 
-        Attribute ldapSyntaxesAttribute = searchResult.getAttributes().get( "ldapSyntaxes" );
+        Attribute ldapSyntaxesAttribute = searchResult.getAttributes().get( "ldapSyntaxes" ); //$NON-NLS-1$
         if ( ldapSyntaxesAttribute != null )
         {
             NamingEnumeration<?> ne = ldapSyntaxesAttribute.getAll();
@@ -333,7 +333,7 @@ public class GenericSchemaConnector exte
             }
         }
 
-        Attribute matchingRulesAttribute = searchResult.getAttributes().get( "matchingRules" );
+        Attribute matchingRulesAttribute = searchResult.getAttributes().get( "matchingRules" ); //$NON-NLS-1$
         if ( matchingRulesAttribute != null )
         {
             NamingEnumeration<?> ne = matchingRulesAttribute.getAll();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java Tue Jan 15 18:21:24 2013
@@ -48,25 +48,25 @@ import org.apache.directory.api.util.Str
  */
 public class SchemaEditorSchemaLoaderUtils
 {
-    private static final String M_COLLECTIVE = "m-collective";
-    private static final String M_DESCRIPTION = "m-description";
-    private static final String M_EQUALITY = "m-equality";
-    private static final String M_LENGTH = "m-length";
-    private static final String M_MAY = "m-may";
-    private static final String M_MUST = "m-must";
-    private static final String M_NAME = "m-name";
-    private static final String M_NO_USER_MODIFICATION = "m-noUserModification";
-    private static final String M_OBSOLETE = "m-obsolete";
-    private static final String M_OID = "m-oid";
-    private static final String M_ORDERING = "m-ordering";
-    private static final String M_SINGLE_VALUE = "m-singleValue";
-    private static final String M_SUBSTR = "m-substr";
-    private static final String M_SUP_ATTRIBUTE_TYPE = "m-supAttributeType";
-    private static final String M_SUP_OBJECT_CLASS = "m-supObjectClass";
-    private static final String M_SYNTAX = "m-syntax";
-    private static final String M_TYPE_OBJECT_CLASS = "m-typeObjectClass";
-    private static final String M_USAGE = "m-usage";
-    private static final String TRUE = "TRUE";
+    private static final String M_COLLECTIVE = "m-collective"; //$NON-NLS-1$
+    private static final String M_DESCRIPTION = "m-description"; //$NON-NLS-1$
+    private static final String M_EQUALITY = "m-equality"; //$NON-NLS-1$
+    private static final String M_LENGTH = "m-length"; //$NON-NLS-1$
+    private static final String M_MAY = "m-may"; //$NON-NLS-1$
+    private static final String M_MUST = "m-must"; //$NON-NLS-1$
+    private static final String M_NAME = "m-name"; //$NON-NLS-1$
+    private static final String M_NO_USER_MODIFICATION = "m-noUserModification"; //$NON-NLS-1$
+    private static final String M_OBSOLETE = "m-obsolete"; //$NON-NLS-1$
+    private static final String M_OID = "m-oid"; //$NON-NLS-1$
+    private static final String M_ORDERING = "m-ordering"; //$NON-NLS-1$
+    private static final String M_SINGLE_VALUE = "m-singleValue"; //$NON-NLS-1$
+    private static final String M_SUBSTR = "m-substr"; //$NON-NLS-1$
+    private static final String M_SUP_ATTRIBUTE_TYPE = "m-supAttributeType"; //$NON-NLS-1$
+    private static final String M_SUP_OBJECT_CLASS = "m-supObjectClass"; //$NON-NLS-1$
+    private static final String M_SYNTAX = "m-syntax"; //$NON-NLS-1$
+    private static final String M_TYPE_OBJECT_CLASS = "m-typeObjectClass"; //$NON-NLS-1$
+    private static final String M_USAGE = "m-usage"; //$NON-NLS-1$
+    private static final String TRUE = "TRUE"; //$NON-NLS-1$
 
 
     /**
@@ -469,7 +469,7 @@ public class SchemaEditorSchemaLoaderUti
             long syntaxLength = attributeType.getSyntaxLength();
             if ( syntaxLength != -1 )
             {
-                attribute = new DefaultAttribute( M_LENGTH, "" + syntaxLength );
+                attribute = new DefaultAttribute( M_LENGTH, "" + syntaxLength ); //$NON-NLS-1$
                 entry.add( attribute );
             }
         }

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Tue Jan 15 18:21:24 2013
@@ -66,7 +66,7 @@ public class ObjectClassSelectionDialogL
             List<String> names = oc.getNames();
             if ( ( names != null ) && ( names.size() > 0 ) )
             {
-                return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")"; //$NON-NLS-2$
+                return ViewUtils.concateAliases( names ) + "  -  (" + oc.getOid() + ")";  //$NON-NLS-1$//$NON-NLS-2$
             }
             else
             {

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/EditorsUtils.java Tue Jan 15 18:21:24 2013
@@ -79,11 +79,11 @@ public class EditorsUtils
 
                     String tooltip = editorPart.getTitleToolTip();
 
-                    if ( ( tooltip != null ) && ( !"".equals( tooltip ) ) )
+                    if ( ( tooltip != null ) && ( !"".equals( tooltip ) ) ) //$NON-NLS-1$
                     {
-                        sb.append( " [" );
+                        sb.append( " [" ); //$NON-NLS-1$
                         sb.append( tooltip );
-                        sb.append( "]" );
+                        sb.append( "]" ); //$NON-NLS-1$
                     }
 
                     return sb.toString();

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Tue Jan 15 18:21:24 2013
@@ -336,43 +336,43 @@ public class ProblemsViewLabelProvider e
 
     private String getMessageATMustHaveSameUsageThanSuperior( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior" );
+        return Messages.getString( "ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior" ); //$NON-NLS-1$
     }
 
 
     private String getMessageATUserApplicationsUsageMustBeUserModifiable( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable" );
+        return Messages.getString( "ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable" ); //$NON-NLS-1$
     }
 
 
     private String getMessageATCollectiveMustHaveUserApplicationsUsage( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage" );
+        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage" ); //$NON-NLS-1$
     }
 
 
     private String getMessageATCollectiveCannotBeSingleValued( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued" );
+        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued" ); //$NON-NLS-1$
     }
 
 
     private String getMessageOCAbstractMustInheritFromAbstractOC( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC" );
+        return Messages.getString( "ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC" ); //$NON-NLS-1$
     }
 
 
     private String getMessageOCAuxiliaryCannotInheritFromStructuralOC( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC" );
+        return Messages.getString( "ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC" ); //$NON-NLS-1$
     }
 
 
     private String getMessageOCStructuralCannotInheritFromAuxiliaryOC( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC" );
+        return Messages.getString( "ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC" ); //$NON-NLS-1$
     }
 
 
@@ -385,7 +385,7 @@ public class ProblemsViewLabelProvider e
 
     private String getMessageOCCycleClassHierarchy( LdapSchemaException exception )
     {
-        return Messages.getString( "ProblemsViewLabelProvider.OCCycleClassHierarchy" );
+        return Messages.getString( "ProblemsViewLabelProvider.OCCycleClassHierarchy" ); //$NON-NLS-1$
     }
 
 
@@ -462,7 +462,7 @@ public class ProblemsViewLabelProvider e
             if ( schemaObject != null )
             {
                 String name = schemaObject.getName();
-                if ( ( name != null ) && ( !name.equals( "" ) ) ) // $NON-NLS-1$
+                if ( ( name != null ) && ( !name.equals( "" ) ) ) // $NON-NLS-1$ //$NON-NLS-1$
                 {
                     return name;
                 }
@@ -477,7 +477,7 @@ public class ProblemsViewLabelProvider e
             }
         }
 
-        return ""; // $NON-NLS-1$
+        return ""; // $NON-NLS-1$ //$NON-NLS-1$
     }
 
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java Tue Jan 15 18:21:24 2013
@@ -884,14 +884,14 @@ public class SchemaViewContentProvider i
         // Removing unattached nodes for "top"
         List<Object> ocChildren = new ArrayList<Object>();
         List<Object> ocChildren2 = null;
-        if ( "2.5.6.0".equals( oc.getOid() ) )
+        if ( "2.5.6.0".equals( oc.getOid() ) ) //$NON-NLS-1$
         {
-            ocChildren2 = hierarchyManager.getChildren( "2.5.6.0" );
+            ocChildren2 = hierarchyManager.getChildren( "2.5.6.0" ); //$NON-NLS-1$
             if ( ocChildren2 != null )
             {
                 ocChildren.addAll( ocChildren2 );
             }
-            ocChildren2 = hierarchyManager.getChildren( "top" );
+            ocChildren2 = hierarchyManager.getChildren( "top" ); //$NON-NLS-1$
             if ( ocChildren2 != null )
             {
                 ocChildren.addAll( ocChildren2 );

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Tue Jan 15 18:21:24 2013
@@ -264,7 +264,7 @@ public class SearchViewLabelProvider ext
             {
                 SchemaObject object = ( SchemaObject ) element;
 
-                label += " " + Messages.getString( "SearchViewLabelProvider.FromSchema" ) + " \"" + object.getSchemaName() + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+                label += " " + Messages.getString( "SearchViewLabelProvider.FromSchema" ) + " \"" + object.getSchemaName() + "\""; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
             }
         }
 

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Tue Jan 15 18:21:24 2013
@@ -325,10 +325,10 @@ public class MergeSchemasWizard extends 
                                     getIdString( sourceAttributeType ),
                                     clonedAttributeType.getSyntaxOid(),
                                     "1.3.6.1.4.1.1466.115.121.1.15 (Directory String)" } ) ); //$NON-NLS-1$
-                        clonedAttributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
-                        clonedAttributeType.setEqualityOid( "caseIgnoreMatch" );
+                        clonedAttributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" ); //$NON-NLS-1$
+                        clonedAttributeType.setEqualityOid( "caseIgnoreMatch" ); //$NON-NLS-1$
                         clonedAttributeType.setOrderingOid( null );
-                        clonedAttributeType.setSubstringOid( "caseIgnoreSubstringsMatch" );
+                        clonedAttributeType.setSubstringOid( "caseIgnoreSubstringsMatch" ); //$NON-NLS-1$
                     }
                 }
                 // TODO: if unknown (single) matching rule: set appropriate matching rule according to syntax

Modified: directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java?rev=1433564&r1=1433563&r2=1433564&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java (original)
+++ directory/studio/trunk/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringParserTest.java Tue Jan 15 18:21:24 2013
@@ -36,7 +36,7 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "" );
+        parser.parse( "" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 0, aliases.size() );
     }
@@ -46,10 +46,10 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "test" );
+        parser.parse( "test" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 1, aliases.size() );
-        assertEquals( "test", aliases.get( 0 ).getAlias() );
+        assertEquals( "test", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
     }
 
 
@@ -57,11 +57,11 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "test1, test2" );
+        parser.parse( "test1, test2" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 2, aliases.size() );
-        assertEquals( "test1", aliases.get( 0 ).getAlias() );
-        assertEquals( "test2", aliases.get( 1 ).getAlias() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
+        assertEquals( "test2", aliases.get( 1 ).getAlias() ); //$NON-NLS-1$
     }
 
 
@@ -69,12 +69,12 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "test1, test2, test3" );
+        parser.parse( "test1, test2, test3" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 3, aliases.size() );
-        assertEquals( "test1", aliases.get( 0 ).getAlias() );
-        assertEquals( "test2", aliases.get( 1 ).getAlias() );
-        assertEquals( "test3", aliases.get( 2 ).getAlias() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
+        assertEquals( "test2", aliases.get( 1 ).getAlias() ); //$NON-NLS-1$
+        assertEquals( "test3", aliases.get( 2 ).getAlias() ); //$NON-NLS-1$
     }
 
 
@@ -82,7 +82,7 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( ",,,,,,,,,,,," );
+        parser.parse( ",,,,,,,,,,,," ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 0, aliases.size() );
     }
@@ -92,7 +92,7 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( ", ,   ,    ,  , ,,,," );
+        parser.parse( ", ,   ,    ,  , ,,,," ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 0, aliases.size() );
     }
@@ -102,11 +102,11 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( ",,test1,,,,,,test2,,,," );
+        parser.parse( ",,test1,,,,,,test2,,,," ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 2, aliases.size() );
-        assertEquals( "test1", aliases.get( 0 ).getAlias() );
-        assertEquals( "test2", aliases.get( 1 ).getAlias() );
+        assertEquals( "test1", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
+        assertEquals( "test2", aliases.get( 1 ).getAlias() ); //$NON-NLS-1$
     }
 
 
@@ -114,10 +114,10 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "1test" );
+        parser.parse( "1test" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 1, aliases.size() );
-        assertEquals( "1test", aliases.get( 0 ).getAlias() );
+        assertEquals( "1test", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithStartError.class, aliases.get( 0 ).getClass() );
     }
 
@@ -126,10 +126,10 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "1" );
+        parser.parse( "1" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 1, aliases.size() );
-        assertEquals( "1", aliases.get( 0 ).getAlias() );
+        assertEquals( "1", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithStartError.class, aliases.get( 0 ).getClass() );
     }
 
@@ -138,10 +138,10 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "tes/t" );
+        parser.parse( "tes/t" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 1, aliases.size() );
-        assertEquals( "tes/t", aliases.get( 0 ).getAlias() );
+        assertEquals( "tes/t", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
     }
 
@@ -150,10 +150,10 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "tes/" );
+        parser.parse( "tes/" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 1, aliases.size() );
-        assertEquals( "tes/", aliases.get( 0 ).getAlias() );
+        assertEquals( "tes/", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
     }
 
@@ -162,12 +162,12 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "tes/t, 1test" );
+        parser.parse( "tes/t, 1test" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 2, aliases.size() );
-        assertEquals( "tes/t", aliases.get( 0 ).getAlias() );
+        assertEquals( "tes/t", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
-        assertEquals( "1test", aliases.get( 1 ).getAlias() );
+        assertEquals( "1test", aliases.get( 1 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithStartError.class, aliases.get( 1 ).getClass() );
     }
 
@@ -176,12 +176,12 @@ public class AliasesStringParserTest ext
     {
         AliasesStringParser parser = new AliasesStringParser();
 
-        parser.parse( "tes/, 1" );
+        parser.parse( "tes/, 1" ); //$NON-NLS-1$
         List<Alias> aliases = parser.getAliases();
         assertEquals( 2, aliases.size() );
-        assertEquals( "tes/", aliases.get( 0 ).getAlias() );
+        assertEquals( "tes/", aliases.get( 0 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithPartError.class, aliases.get( 0 ).getClass() );
-        assertEquals( "1", aliases.get( 1 ).getAlias() );
+        assertEquals( "1", aliases.get( 1 ).getAlias() ); //$NON-NLS-1$
         assertEquals( AliasWithStartError.class, aliases.get( 1 ).getClass() );
     }
 }



Mime
View raw message