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 2013/04/11 19:07:24 UTC
svn commit: r1466974 - in
/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor:
PluginConstants.java PluginUtils.java
view/dialogs/ObjectClassSelectionDialogLabelProvider.java
Author: pamarcelot
Date: Thu Apr 11 17:07:15 2013
New Revision: 1466974
URL: http://svn.apache.org/r1466974
Log:
Applied formatter.
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/view/dialogs/ObjectClassSelectionDialogLabelProvider.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=1466974&r1=1466973&r2=1466974&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 Thu Apr 11 17:07:15 2013
@@ -46,64 +46,64 @@ public final class PluginConstants
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" ); //$NON-NLS-1$
+ public static final String PERSPECTIVE_SCHEMA_EDITOR_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PERSPECTIVE_LDAP_BROWSER_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PERSPECTIVE_TOP_LEFT_FOLDER_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PERSPECTIVE_BOTTOM_FOLDER_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String EDITOR_ATTRIBUTE_TYPE_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String EDITOR_OBJECT_CLASS_ID = Activator.getDefault().getPluginProperties()
+ .getString( "Editor_ObjectClassEditor_id" ); //$NON-NLS-1$
/** The Schema Editor ID */
- public static final String EDITOR_SCHEMA_ID = Activator.getDefault().getPluginProperties().getString(
- "Editor_SchemaEditor_id" ); //$NON-NLS-1$
+ public static final String EDITOR_SCHEMA_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PREF_PAGE_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PREF_PAGE_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String PREF_PAGE_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String VIEW_HIERARCHY_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String VIEW_PROBLEMS_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String VIEW_PROJECTS_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String VIEW_SCHEMA_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String VIEW_SEARCH_VIEW_ID = Activator.getDefault().getPluginProperties()
+ .getString( "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()
@@ -114,12 +114,12 @@ public final class PluginConstants
.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" ); //$NON-NLS-1$
+ public static final String NEW_WIZARD_NEW_PROJECT_WIZARD = Activator.getDefault().getPluginProperties()
+ .getString( "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" ); //$NON-NLS-1$
+ public static final String NEW_WIZARD_NEW_SCHEMA_WIZARD = Activator.getDefault().getPluginProperties()
+ .getString( "NewWizard_NewSchemaWizard_id" ); //$NON-NLS-1$
// Images
public static final String IMG_ATTRIBUTE_TYPE = "resources/icons/attribute_type.gif"; //$NON-NLS-1$
@@ -198,26 +198,26 @@ public final class PluginConstants
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" ); //$NON-NLS-1$
- public static final String CMD_DELETE_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_DeleteSchemaElement_id" ); //$NON-NLS-1$
- public static final String CMD_OPEN_ELEMENT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_OpenElement_id" ); //$NON-NLS-1$
- public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.getDefault().getPluginProperties().getString(
- "Cmd_OpenTypeHierarchy_id" ); //$NON-NLS-1$
- public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewAttributeType_id" ); //$NON-NLS-1$
- public static final String CMD_NEW_OBJECT_CLASS = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewObjectClass_id" ); //$NON-NLS-1$
- public static final String CMD_NEW_PROJECT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewProject_id" ); //$NON-NLS-1$
- public static final String CMD_NEW_SCHEMA = Activator.getDefault().getPluginProperties().getString(
- "Cmd_NewSchema_id" ); //$NON-NLS-1$
- public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_RenameProject_id" ); //$NON-NLS-1$
- public static final String CMD_RENAME_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties().getString(
- "Cmd_RenameSchemaElement_id" ); //$NON-NLS-1$
+ public static final String CMD_DELETE_PROJECT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_DeleteProject_id" ); //$NON-NLS-1$
+ public static final String CMD_DELETE_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_DeleteSchemaElement_id" ); //$NON-NLS-1$
+ public static final String CMD_OPEN_ELEMENT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_OpenElement_id" ); //$NON-NLS-1$
+ public static final String CMD_OPEN_TYPE_HIERARCHY = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_OpenTypeHierarchy_id" ); //$NON-NLS-1$
+ public static final String CMD_NEW_ATTRIBUTE_TYPE = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_NewAttributeType_id" ); //$NON-NLS-1$
+ public static final String CMD_NEW_OBJECT_CLASS = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_NewObjectClass_id" ); //$NON-NLS-1$
+ public static final String CMD_NEW_PROJECT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_NewProject_id" ); //$NON-NLS-1$
+ public static final String CMD_NEW_SCHEMA = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_NewSchema_id" ); //$NON-NLS-1$
+ public static final String CMD_RENAME_PROJECT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_RenameProject_id" ); //$NON-NLS-1$
+ public static final String CMD_RENAME_SCHEMA_ELEMENT = Activator.getDefault().getPluginProperties()
+ .getString( "Cmd_RenameSchemaElement_id" ); //$NON-NLS-1$
// Preferences - DifferencesWidget
/** The preferences ID for DifferencesWidget Grouping */
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=1466974&r1=1466973&r2=1466974&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 Thu Apr 11 17:07:15 2013
@@ -353,8 +353,8 @@ public class PluginUtils
if ( url == null )
{
reportError(
- 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$
+ 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
{
@@ -365,19 +365,19 @@ public class PluginUtils
{
reportError(
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$
+ 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-1$//$NON-NLS-2$ //$NON-NLS-3$
- Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-1$//$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-1$//$NON-NLS-2$ //$NON-NLS-3$
- Messages.getString( "PluginUtils.SchemaLoadingError" ) + schemaName + "." ); //$NON-NLS-1$//$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;
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=1466974&r1=1466973&r2=1466974&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 Thu Apr 11 17:07:15 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-1$//$NON-NLS-2$
+ return ViewUtils.concateAliases( names ) + " - (" + oc.getOid() + ")"; //$NON-NLS-1$//$NON-NLS-2$
}
else
{