You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/10/22 08:40:46 UTC
svn commit: r828324 [1/2] - in
/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor:
controller/ controller/actions/ model/ model/alias/ model/hierarchy/
model/io/ view/dialogs/ view/editors/attributetype/ view/ed...
Author: seelmann
Date: Thu Oct 22 06:40:43 2009
New Revision: 828324
URL: http://svn.apache.org/viewvc?rev=828324&view=rev
Log:
Ignore externalized strings and constants
Modified:
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsViewController.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringToken.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyWrapper.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/PreviousSearchesDialog.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.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/AttributeTypeEditorInput.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/ObjectClassEditorInput.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/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/views/ProblemsViewLabelProvider.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/SearchViewContentProvider.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.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/MergeSchemasOptionsWizardPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.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/wrappers/FirstNameSorter.java
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/HierarchyViewController.java Thu Oct 22 06:40:43 2009
@@ -134,9 +134,9 @@
}
catch ( PartInitException e )
{
- PluginUtils.logError( Messages.getString( "HierarchyViewController.ErrorOpeningEditor" ), e );
- ViewUtils.displayErrorMessageBox( Messages.getString( "HierarchyViewController.Error" ), Messages
- .getString( "HierarchyViewController.ErrorOpeningEditor" ) );
+ PluginUtils.logError( Messages.getString( "HierarchyViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageBox( Messages.getString( "HierarchyViewController.Error" ), Messages //$NON-NLS-1$
+ .getString( "HierarchyViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java Thu Oct 22 06:40:43 2009
@@ -157,9 +157,9 @@
}
catch ( PartInitException e )
{
- PluginUtils.logError( Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ), e );
- ViewUtils.displayErrorMessageBox( Messages.getString( "ProblemsViewController.Error" ),
- Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ) );
+ PluginUtils.logError( Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageBox( Messages.getString( "ProblemsViewController.Error" ), //$NON-NLS-1$
+ Messages.getString( "ProblemsViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsViewController.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsViewController.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProjectsViewController.java Thu Oct 22 06:40:43 2009
@@ -147,8 +147,8 @@
{
public void menuAboutToShow( IMenuManager manager )
{
- MenuManager importManager = new MenuManager( Messages.getString( "ProjectsViewController.ImportAction" ) );
- MenuManager exportManager = new MenuManager( Messages.getString( "ProjectsViewController.ExportAction" ) );
+ MenuManager importManager = new MenuManager( Messages.getString( "ProjectsViewController.ImportAction" ) ); //$NON-NLS-1$
+ MenuManager exportManager = new MenuManager( Messages.getString( "ProjectsViewController.ExportAction" ) ); //$NON-NLS-1$
manager.add( newProject );
manager.add( new Separator() );
manager.add( openProject );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaViewController.java Thu Oct 22 06:40:43 2009
@@ -323,7 +323,7 @@
menu.add( openSchemaViewSortingDialog );
menu.add( new Separator() );
IMenuManager schemaPresentationMenu = new MenuManager( Messages
- .getString( "SchemaViewController.SchemaPresentationAction" ) );
+ .getString( "SchemaViewController.SchemaPresentationAction" ) ); //$NON-NLS-1$
schemaPresentationMenu.add( switchSchemaPresentationToFlat );
schemaPresentationMenu.add( switchSchemaPresentationToHierarchical );
menu.add( schemaPresentationMenu );
@@ -345,9 +345,9 @@
{
public void menuAboutToShow( IMenuManager manager )
{
- MenuManager newManager = new MenuManager( Messages.getString( "SchemaViewController.NewAction" ) );
- MenuManager importManager = new MenuManager( Messages.getString( "SchemaViewController.ImportAction" ) );
- MenuManager exportManager = new MenuManager( Messages.getString( "SchemaViewController.ExportAction" ) );
+ MenuManager newManager = new MenuManager( Messages.getString( "SchemaViewController.NewAction" ) ); //$NON-NLS-1$
+ MenuManager importManager = new MenuManager( Messages.getString( "SchemaViewController.ImportAction" ) ); //$NON-NLS-1$
+ MenuManager exportManager = new MenuManager( Messages.getString( "SchemaViewController.ExportAction" ) ); //$NON-NLS-1$
manager.add( newManager );
newManager.add( newSchema );
newManager.add( newAttributeType );
@@ -514,9 +514,9 @@
}
catch ( PartInitException e )
{
- PluginUtils.logError( Messages.getString( "SchemaViewController.ErrorOpeningEditor" ), e );
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaViewController.error" ), Messages
- .getString( "SchemaViewController.ErrorOpeningEditor" ) );
+ PluginUtils.logError( Messages.getString( "SchemaViewController.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaViewController.error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaViewController.ErrorOpeningEditor" ) ); //$NON-NLS-1$
}
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenElementAction.java Thu Oct 22 06:40:43 2009
@@ -94,7 +94,7 @@
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$
+ Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
else if ( selectedItem instanceof ObjectClassWrapper )
@@ -110,7 +110,7 @@
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$
+ Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
else if ( selectedItem instanceof SchemaWrapper )
@@ -125,7 +125,7 @@
PluginUtils.logError( Messages.getString( "OpenElementAction.ErrorOpeningEditor" ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$
+ Messages.getString( "OpenElementAction.Error" ), Messages.getString( "OpenElementAction.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
else if ( selectedItem instanceof Folder )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/actions/OpenTypeHierarchyAction.java Thu Oct 22 06:40:43 2009
@@ -169,7 +169,7 @@
PluginUtils.logError( Messages.getString( "OpenTypeHierarchyAction.ErrorOpeningView" ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "OpenTypeHierarchyAction.Error" ), Messages.getString( "OpenTypeHierarchyAction.ErrorOpeningView" ) ); //$NON-NLS-1$
+ Messages.getString( "OpenTypeHierarchyAction.Error" ), Messages.getString( "OpenTypeHierarchyAction.ErrorOpeningView" ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java Thu Oct 22 06:40:43 2009
@@ -291,7 +291,7 @@
if ( mandatoryAttributeType == null )
{
throw new DependencyComputerException( NLS.bind( Messages
- .getString( "DependenciesComputer.Mandatory" ), new String[]
+ .getString( "DependenciesComputer.Mandatory" ), new String[] //$NON-NLS-1$
{ mandatoryAttributeTypeName } ) ); //$NON-NLS-1$
}
else
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringScanner.java Thu Oct 22 06:40:43 2009
@@ -41,7 +41,7 @@
public AliasesStringScanner()
{
super();
- aliases = "";
+ aliases = ""; //$NON-NLS-1$
}
@@ -109,7 +109,7 @@
if ( c == CHAR_EOF )
{
lastTokenType = AliasesStringToken.EOF;
- return new AliasesStringToken( lastTokenType, "", pos );
+ return new AliasesStringToken( lastTokenType, "", pos ); //$NON-NLS-1$
}
prevChar();
@@ -152,7 +152,7 @@
if ( c == CHAR_COMMA )
{
lastTokenType = AliasesStringToken.COMMA;
- return new AliasesStringToken( lastTokenType, ",", pos );
+ return new AliasesStringToken( lastTokenType, ",", pos ); //$NON-NLS-1$
}
prevChar();
@@ -195,7 +195,7 @@
else
{
lastTokenType = AliasesStringToken.ERROR_ALIAS_START;
- return new AliasesStringToken( lastTokenType, c + "", pos );
+ return new AliasesStringToken( lastTokenType, c + "", pos ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringToken.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringToken.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringToken.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/alias/AliasesStringToken.java Thu Oct 22 06:40:43 2009
@@ -120,7 +120,7 @@
*/
public String toString()
{
- return "(" + offset + ") " + "(" + type + ") " + value;
+ return "(" + offset + ") " + "(" + type + ") " + value; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
@@ -136,7 +136,7 @@
}
else
{
- throw new ClassCastException( "Not instanceof AliasesToken: " + o.getClass().getName() );
+ throw new ClassCastException( "Not instanceof AliasesToken: " + o.getClass().getName() ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyManager.java Thu Oct 22 06:40:43 2009
@@ -410,7 +410,7 @@
{
// Removing the attribute type as child of its superior
String superiorName = at.getSuperiorName();
- if ( ( superiorName != null ) && ( !"".equals( superiorName ) ) )
+ if ( ( superiorName != null ) && ( !"".equals( superiorName ) ) ) //$NON-NLS-1$
{
AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superiorName );
if ( superiorAT == null )
@@ -440,7 +440,7 @@
parentsMap.put( child, root );
childrenMap.put( root, child );
String childSuperiorName = childAT.getSuperiorName();
- if ( ( childSuperiorName != null ) && ( !"".equals( childSuperiorName ) ) )
+ if ( ( childSuperiorName != null ) && ( !"".equals( childSuperiorName ) ) ) //$NON-NLS-1$
{
parentsMap.put( child, childSuperiorName.toLowerCase() );
childrenMap.put( childSuperiorName.toLowerCase(), child );
@@ -461,7 +461,7 @@
{
for ( String superClassName : superClassesNames )
{
- if ( !"".equals( superClassName ) )
+ if ( !"".equals( superClassName ) ) //$NON-NLS-1$
{
ObjectClassImpl superClassOC = schemaHandler.getObjectClass( superClassName );
if ( superClassOC == null )
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyWrapper.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyWrapper.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/hierarchy/HierarchyWrapper.java Thu Oct 22 06:40:43 2009
@@ -226,6 +226,6 @@
*/
public String toString()
{
- return "{|" + wrappedObject + "|" + children + "}";
+ return "{|" + wrappedObject + "|" + children + "}"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Thu Oct 22 06:40:43 2009
@@ -139,7 +139,7 @@
constraintSearch.setReturningAttributes( new String[]
{ "subschemaSubentry" } );
- 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 )
@@ -188,7 +188,7 @@
StudioProgressMonitor monitor ) throws NamingException, ParseException
{
// Creating the schema
- Schema schema = new SchemaImpl( "schema" );
+ Schema schema = new SchemaImpl( "schema" ); //$NON-NLS-1$
Attribute attributeTypesAttribute = searchResult.getAttributes().get( "attributeTypes" );
if ( attributeTypesAttribute != null )
@@ -222,7 +222,7 @@
impl.setSchemaObject( schema );
// Active Directory hack
- if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) )
+ if ( impl.getSyntaxOid() != null && "OctetString".equalsIgnoreCase( impl.getSyntaxOid() ) ) //$NON-NLS-1$
{
impl.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.40" );
}
@@ -298,7 +298,7 @@
impl.setSchema( schema.getName() );
impl.setSchemaObject( schema );
String oidDescription = Utils.getOidDescription( syntaxOid );
- impl.setDescription( oidDescription != null ? oidDescription : "Dummy" );
+ impl.setDescription( oidDescription != null ? oidDescription : "Dummy" ); //$NON-NLS-1$
impl.setNames( new String[]
{ impl.getDescription() } );
schema.addSyntax( impl );
@@ -352,7 +352,7 @@
MatchingRuleImpl impl = new MatchingRuleImpl( matchingRuleName );
impl.setSchema( schema.getName() );
impl.setSchemaObject( schema );
- impl.setDescription( "Dummy" );
+ impl.setDescription( "Dummy" ); //$NON-NLS-1$
impl.setNames( new String[]
{ matchingRuleName } );
schema.addMatchingRule( impl );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Thu Oct 22 06:40:43 2009
@@ -51,13 +51,13 @@
for ( AttributeTypeImpl at : schema.getAttributeTypes() )
{
sb.append( toSourceCode( at ) );
- sb.append( "\n" );
+ sb.append( "\n" ); //$NON-NLS-1$
}
for ( ObjectClassImpl oc : schema.getObjectClasses() )
{
sb.append( toSourceCode( oc ) );
- sb.append( "\n" );
+ sb.append( "\n" ); //$NON-NLS-1$
}
return sb.toString();
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Thu Oct 22 06:40:43 2009
@@ -85,11 +85,11 @@
{
ExceptionMessage exceptionMessage = parseExceptionMessage( e.getMessage() );
throw new OpenLdapSchemaFileImportException( NLS.bind( Messages
- .getString( "OpenLdapSchemaFileImporter.NotReadCorrectly" ), new String[]
- { path } ) //$NON-NLS-1$
- + ( exceptionMessage == null ? "" : NLS.bind( Messages
- .getString( "OpenLdapSchemaFileImporter.ErrorMessage" ), new String[]
- { exceptionMessage.lineNumber, exceptionMessage.columnNumber, exceptionMessage.cause } ) ), e ); //$NON-NLS-1$
+ .getString( "OpenLdapSchemaFileImporter.NotReadCorrectly" ), new String[] //$NON-NLS-1$
+ { path } )
+ + ( exceptionMessage == null ? "" : NLS.bind( Messages //$NON-NLS-1$
+ .getString( "OpenLdapSchemaFileImporter.ErrorMessage" ), new String[] //$NON-NLS-1$
+ { exceptionMessage.lineNumber, exceptionMessage.columnNumber, exceptionMessage.cause } ) ), e );
}
String schemaName = getNameFromPath( path );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsExporter.java Thu Oct 22 06:40:43 2009
@@ -40,13 +40,13 @@
public class ProjectsExporter
{
// The tags
- private static final String PROJECT_TAG = "project";
- private static final String PROJECTS_TAG = "projects";
- private static final String NAME_TAG = "name";
- private static final String TYPE_TAG = "type";
- private static final String CONNECTION_TAG = "connection";
- private static final String SCHEMA_CONNECTOR_TAG = "schemaConnector";
- private static final String SCHEMA_BACKUP_TAG = "schemaBackup";
+ private static final String PROJECT_TAG = "project"; //$NON-NLS-1$
+ private static final String PROJECTS_TAG = "projects"; //$NON-NLS-1$
+ private static final String NAME_TAG = "name"; //$NON-NLS-1$
+ private static final String TYPE_TAG = "type"; //$NON-NLS-1$
+ private static final String CONNECTION_TAG = "connection"; //$NON-NLS-1$
+ private static final String SCHEMA_CONNECTOR_TAG = "schemaConnector"; //$NON-NLS-1$
+ private static final String SCHEMA_BACKUP_TAG = "schemaBackup"; //$NON-NLS-1$
/**
@@ -114,7 +114,7 @@
{
// Name
String name = project.getName();
- if ( ( name != null ) && ( !name.equals( "" ) ) )
+ if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
{
element.addAttribute( NAME_TAG, name );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ProjectsImporter.java Thu Oct 22 06:40:43 2009
@@ -81,7 +81,7 @@
}
catch ( DocumentException e )
{
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
@@ -89,7 +89,7 @@
Element rootElement = document.getRootElement();
if ( !rootElement.getName().equals( PROJECT_TAG ) )
{
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
@@ -124,9 +124,9 @@
}
catch ( DocumentException e )
{
- PluginUtils.logError( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ), new String[]
+ PluginUtils.logError( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ), new String[] //$NON-NLS-1$
{ path } ), e );
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
@@ -134,7 +134,7 @@
Element rootElement = document.getRootElement();
if ( !rootElement.getName().equals( PROJECTS_TAG ) )
{
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
@@ -182,7 +182,7 @@
}
catch ( IllegalArgumentException e )
{
- throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableValue" ) );
+ throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableValue" ) ); //$NON-NLS-1$
}
}
@@ -215,7 +215,7 @@
if ( schemaConnector == null )
{
throw new ProjectsImportException( NLS.bind( Messages
- .getString( "ProjectsImporter.NoSchemaConnectorIDFound" ), new String[]
+ .getString( "ProjectsImporter.NoSchemaConnectorIDFound" ), new String[] //$NON-NLS-1$
{ schemaConnectorId } ) ); //$NON-NLS-1$
}
@@ -240,7 +240,7 @@
}
catch ( XMLSchemaFileImportException e )
{
- throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableSchema" ) );
+ throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableSchema" ) ); //$NON-NLS-1$
}
project.setSchemaBackup( Arrays.asList( schemas ) );
@@ -259,7 +259,7 @@
}
catch ( XMLSchemaFileImportException e )
{
- throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableSchema" ) );
+ throw new ProjectsImportException( Messages.getString( "ProjectsImporter.NotConvertableSchema" ) ); //$NON-NLS-1$
}
for ( Schema schema : schemas )
{
@@ -303,7 +303,7 @@
}
catch ( DocumentException e )
{
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotReadCorrectly" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
@@ -319,7 +319,7 @@
}
else
{
- throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ),
+ throw new ProjectsImportException( NLS.bind( Messages.getString( "ProjectsImporter.NotValidProject" ), //$NON-NLS-1$
new String[]
{ path } ) );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Thu Oct 22 06:40:43 2009
@@ -49,39 +49,39 @@
public class XMLSchemaFileExporter
{
// The Tags
- private static final String ALIAS_TAG = "alias";
- private static final String ALIASES_TAG = "aliases";
- private static final String ATTRIBUTE_TYPE_TAG = "attributetype";
- private static final String ATTRIBUTE_TYPES_TAG = "attributetypes";
- private static final String BOOLEAN_FALSE = "false";
- private static final String BOOLEAN_TRUE = "true";
- private static final String COLLECTIVE_TAG = "collective";
- private static final String DESCRIPTION_TAG = "description";
- private static final String EQUALITY_TAG = "equality";
- private static final String HUMAN_READABLE_TAG = "humanreadable";
- private static final String MANDATORY_TAG = "mandatory";
- private static final String MATCHING_RULE_TAG = "matchingrule";
- private static final String MATCHING_RULES_TAG = "matchingrules";
- private static final String NAME_TAG = "name";
- private static final String NO_USER_MODIFICATION_TAG = "nousermodification";
- private static final String OBJECT_CLASS_TAG = "objectclass";
- private static final String OBJECT_CLASSES_TAG = "objectclasses";
- private static final String OBSOLETE_TAG = "obsolete";
- private static final String OID_TAG = "oid";
- private static final String OPTIONAL_TAG = "optional";
- private static final String ORDERING_TAG = "ordering";
- private static final String SCHEMA_TAG = "schema";
- private static final String SCHEMAS_TAG = "schemas";
- private static final String SINGLE_VALUE_TAG = "singlevalue";
- private static final String SUBSTRING_TAG = "substring";
- private static final String SUPERIOR_TAG = "superior";
- private static final String SUPERIORS_TAG = "superiors";
- private static final String SYNTAX_LENGTH_TAG = "syntaxlength";
- private static final String SYNTAX_OID_TAG = "syntaxoid";
- private static final String SYNTAX_TAG = "syntax";
- private static final String SYNTAXES_TAG = "syntaxes";
- private static final String TYPE_TAG = "type";
- private static final String USAGE_TAG = "usage";
+ private static final String ALIAS_TAG = "alias"; //$NON-NLS-1$
+ private static final String ALIASES_TAG = "aliases"; //$NON-NLS-1$
+ private static final String ATTRIBUTE_TYPE_TAG = "attributetype"; //$NON-NLS-1$
+ private static final String ATTRIBUTE_TYPES_TAG = "attributetypes"; //$NON-NLS-1$
+ private static final String BOOLEAN_FALSE = "false"; //$NON-NLS-1$
+ private static final String BOOLEAN_TRUE = "true"; //$NON-NLS-1$
+ private static final String COLLECTIVE_TAG = "collective"; //$NON-NLS-1$
+ private static final String DESCRIPTION_TAG = "description"; //$NON-NLS-1$
+ private static final String EQUALITY_TAG = "equality"; //$NON-NLS-1$
+ private static final String HUMAN_READABLE_TAG = "humanreadable"; //$NON-NLS-1$
+ private static final String MANDATORY_TAG = "mandatory"; //$NON-NLS-1$
+ private static final String MATCHING_RULE_TAG = "matchingrule"; //$NON-NLS-1$
+ private static final String MATCHING_RULES_TAG = "matchingrules"; //$NON-NLS-1$
+ private static final String NAME_TAG = "name"; //$NON-NLS-1$
+ private static final String NO_USER_MODIFICATION_TAG = "nousermodification"; //$NON-NLS-1$
+ private static final String OBJECT_CLASS_TAG = "objectclass"; //$NON-NLS-1$
+ private static final String OBJECT_CLASSES_TAG = "objectclasses"; //$NON-NLS-1$
+ private static final String OBSOLETE_TAG = "obsolete"; //$NON-NLS-1$
+ private static final String OID_TAG = "oid"; //$NON-NLS-1$
+ private static final String OPTIONAL_TAG = "optional"; //$NON-NLS-1$
+ private static final String ORDERING_TAG = "ordering"; //$NON-NLS-1$
+ private static final String SCHEMA_TAG = "schema"; //$NON-NLS-1$
+ private static final String SCHEMAS_TAG = "schemas"; //$NON-NLS-1$
+ private static final String SINGLE_VALUE_TAG = "singlevalue"; //$NON-NLS-1$
+ private static final String SUBSTRING_TAG = "substring"; //$NON-NLS-1$
+ private static final String SUPERIOR_TAG = "superior"; //$NON-NLS-1$
+ private static final String SUPERIORS_TAG = "superiors"; //$NON-NLS-1$
+ private static final String SYNTAX_LENGTH_TAG = "syntaxlength"; //$NON-NLS-1$
+ private static final String SYNTAX_OID_TAG = "syntaxoid"; //$NON-NLS-1$
+ private static final String SYNTAX_TAG = "syntax"; //$NON-NLS-1$
+ private static final String SYNTAXES_TAG = "syntaxes"; //$NON-NLS-1$
+ private static final String TYPE_TAG = "type"; //$NON-NLS-1$
+ private static final String USAGE_TAG = "usage"; //$NON-NLS-1$
/**
@@ -188,7 +188,7 @@
{
// Name
String name = schema.getName();
- if ( ( name != null ) && ( !name.equals( "" ) ) )
+ if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
{
element.addAttribute( NAME_TAG, name );
}
@@ -254,7 +254,7 @@
// OID
String oid = at.getOid();
- if ( ( oid != null ) && ( !oid.equals( "" ) ) )
+ if ( ( oid != null ) && ( !oid.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addAttribute( OID_TAG, oid );
}
@@ -272,14 +272,14 @@
// Description
String description = at.getDescription();
- if ( ( description != null ) && ( !description.equals( "" ) ) )
+ if ( ( description != null ) && ( !description.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( DESCRIPTION_TAG ).setText( description );
}
// Superior
String superior = at.getSuperiorName();
- if ( ( superior != null ) && ( !superior.equals( "" ) ) )
+ if ( ( superior != null ) && ( !superior.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( SUPERIOR_TAG ).setText( superior );
}
@@ -293,7 +293,7 @@
// Syntax
String syntax = at.getSyntaxOid();
- if ( ( syntax != null ) && ( !syntax.equals( "" ) ) )
+ if ( ( syntax != null ) && ( !syntax.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( SYNTAX_TAG ).setText( syntax );
}
@@ -302,7 +302,7 @@
int syntaxLength = at.getLength();
if ( syntaxLength > 0 )
{
- atNode.addElement( SYNTAX_LENGTH_TAG ).setText( "" + syntaxLength );
+ atNode.addElement( SYNTAX_LENGTH_TAG ).setText( "" + syntaxLength ); //$NON-NLS-1$
}
// Obsolete
@@ -347,21 +347,21 @@
// Equality
String equality = at.getEqualityName();
- if ( ( equality != null ) && ( !equality.equals( "" ) ) )
+ if ( ( equality != null ) && ( !equality.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( EQUALITY_TAG ).setText( equality );
}
// Ordering
String ordering = at.getOrderingName();
- if ( ( ordering != null ) && ( !ordering.equals( "" ) ) )
+ if ( ( ordering != null ) && ( !ordering.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( ORDERING_TAG ).setText( ordering );
}
// Substring
String substring = at.getSubstrName();
- if ( ( substring != null ) && ( !substring.equals( "" ) ) )
+ if ( ( substring != null ) && ( !substring.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( SUBSTRING_TAG ).setText( substring );
}
@@ -382,7 +382,7 @@
// OID
String oid = oc.getOid();
- if ( ( oid != null ) && ( !oid.equals( "" ) ) )
+ if ( ( oid != null ) && ( !oid.equals( "" ) ) ) //$NON-NLS-1$
{
ocNode.addAttribute( OID_TAG, oid );
}
@@ -400,7 +400,7 @@
// Description
String description = oc.getDescription();
- if ( ( description != null ) && ( !description.equals( "" ) ) )
+ if ( ( description != null ) && ( !description.equals( "" ) ) ) //$NON-NLS-1$
{
ocNode.addElement( DESCRIPTION_TAG ).setText( description );
}
@@ -471,7 +471,7 @@
// OID
String oid = mr.getOid();
- if ( ( oid != null ) && ( !oid.equals( "" ) ) )
+ if ( ( oid != null ) && ( !oid.equals( "" ) ) ) //$NON-NLS-1$
{
mrNode.addAttribute( OID_TAG, oid );
}
@@ -489,7 +489,7 @@
// Description
String description = mr.getDescription();
- if ( ( description != null ) && ( !description.equals( "" ) ) )
+ if ( ( description != null ) && ( !description.equals( "" ) ) ) //$NON-NLS-1$
{
mrNode.addElement( DESCRIPTION_TAG ).setText( description );
}
@@ -506,7 +506,7 @@
// Syntax OID
String syntaxOid = mr.getSyntaxOid();
- if ( ( syntaxOid != null ) && ( !syntaxOid.equals( "" ) ) )
+ if ( ( syntaxOid != null ) && ( !syntaxOid.equals( "" ) ) ) //$NON-NLS-1$
{
mrNode.addElement( SYNTAX_OID_TAG ).setText( syntaxOid );
}
@@ -530,7 +530,7 @@
// OID
String oid = syntax.getOid();
- if ( ( oid != null ) && ( !oid.equals( "" ) ) )
+ if ( ( oid != null ) && ( !oid.equals( "" ) ) ) //$NON-NLS-1$
{
syntaxNode.addAttribute( OID_TAG, oid );
}
@@ -548,7 +548,7 @@
// Description
String description = syntax.getDescription();
- if ( ( description != null ) && ( !description.equals( "" ) ) )
+ if ( ( description != null ) && ( !description.equals( "" ) ) ) //$NON-NLS-1$
{
syntaxNode.addElement( DESCRIPTION_TAG ).setText( description );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Thu Oct 22 06:40:43 2009
@@ -319,7 +319,7 @@
}
else
{
- throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoOIDInAttribute" ) );
+ throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoOIDInAttribute" ) ); //$NON-NLS-1$
}
// Schema
@@ -367,7 +367,7 @@
catch ( IllegalArgumentException e )
{
throw new XMLSchemaFileImportException( Messages
- .getString( "XMLSchemaFileImporter.UnceonvertableAttribute" ), e );
+ .getString( "XMLSchemaFileImporter.UnceonvertableAttribute" ), e ); //$NON-NLS-1$
}
}
@@ -389,7 +389,7 @@
catch ( NumberFormatException e )
{
throw new XMLSchemaFileImportException( Messages
- .getString( "XMLSchemaFileImporter.UnconvertableInteger" ), e );
+ .getString( "XMLSchemaFileImporter.UnconvertableInteger" ), e ); //$NON-NLS-1$
}
}
@@ -490,7 +490,7 @@
}
else
{
- throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoOIDInClass" ) );
+ throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoOIDInClass" ) ); //$NON-NLS-1$
}
// Schema
@@ -638,7 +638,7 @@
}
else
{
- throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoMatchingRuleForOID" ) );
+ throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.NoMatchingRuleForOID" ) ); //$NON-NLS-1$
}
// Schema
@@ -730,7 +730,7 @@
}
else
{
- throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.InvalidSyntaxForOID" ) );
+ throw new XMLSchemaFileImportException( Messages.getString( "XMLSchemaFileImporter.InvalidSyntaxForOID" ) ); //$NON-NLS-1$
}
// Schema
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Thu Oct 22 06:40:43 2009
@@ -93,7 +93,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "AttributeTypeSelectionDialog.TypeSelection" ) );
+ newShell.setText( Messages.getString( "AttributeTypeSelectionDialog.TypeSelection" ) ); //$NON-NLS-1$
}
@@ -107,7 +107,7 @@
composite.setLayout( layout );
Label chooseLabel = new Label( composite, SWT.NONE );
- chooseLabel.setText( Messages.getString( "AttributeTypeSelectionDialog.ChooseAType" ) );
+ chooseLabel.setText( Messages.getString( "AttributeTypeSelectionDialog.ChooseAType" ) ); //$NON-NLS-1$
chooseLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText = new Text( composite, SWT.BORDER );
@@ -131,7 +131,7 @@
} );
Label matchingLabel = new Label( composite, SWT.NONE );
- matchingLabel.setText( Messages.getString( "AttributeTypeSelectionDialog.MatchingTypes" ) );
+ matchingLabel.setText( Messages.getString( "AttributeTypeSelectionDialog.MatchingTypes" ) ); //$NON-NLS-1$
matchingLabel.setLayoutData( new GridData( SWT.FILL, SWT.None, true, false ) );
attributeTypesTable = new Table( composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
@@ -249,8 +249,8 @@
StructuredSelection selection = ( StructuredSelection ) attributeTypesTableViewer.getSelection();
if ( selection.isEmpty() )
{
- MessageDialog.openError( getShell(), Messages.getString( "AttributeTypeSelectionDialog.InvalidSelection" ),
- Messages.getString( "AttributeTypeSelectionDialog.MustChooseType" ) );
+ MessageDialog.openError( getShell(), Messages.getString( "AttributeTypeSelectionDialog.InvalidSelection" ), //$NON-NLS-1$
+ Messages.getString( "AttributeTypeSelectionDialog.MustChooseType" ) ); //$NON-NLS-1$
return;
}
else
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java Thu Oct 22 06:40:43 2009
@@ -138,7 +138,7 @@
// Aliases Label
Label aliasesLabel = new Label( composite, SWT.NONE );
- aliasesLabel.setText( Messages.getString( "EditAliasesDialog.Aliases" ) );
+ aliasesLabel.setText( Messages.getString( "EditAliasesDialog.Aliases" ) ); //$NON-NLS-1$
aliasesLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, true, 2, 1 ) );
// Aliases Table
@@ -159,18 +159,18 @@
// Add Button
addButton = new Button( composite, SWT.PUSH );
- addButton.setText( Messages.getString( "EditAliasesDialog.Add" ) );
+ addButton.setText( Messages.getString( "EditAliasesDialog.Add" ) ); //$NON-NLS-1$
addButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
// Edit Button
editButton = new Button( composite, SWT.PUSH );
- editButton.setText( Messages.getString( "EditAliasesDialog.Edit" ) );
+ editButton.setText( Messages.getString( "EditAliasesDialog.Edit" ) ); //$NON-NLS-1$
editButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
editButton.setEnabled( false );
// Remove Button
removeButton = new Button( composite, SWT.PUSH );
- removeButton.setText( Messages.getString( "EditAliasesDialog.Remove" ) );
+ removeButton.setText( Messages.getString( "EditAliasesDialog.Remove" ) ); //$NON-NLS-1$
removeButton.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
removeButton.setEnabled( false );
@@ -257,7 +257,7 @@
Menu menu = new Menu( getShell(), SWT.POP_UP );
aliasesTable.setMenu( menu );
MenuItem removeMenuItem = new MenuItem( menu, SWT.PUSH );
- removeMenuItem.setText( Messages.getString( "EditAliasesDialog.Remove" ) );
+ removeMenuItem.setText( Messages.getString( "EditAliasesDialog.Remove" ) ); //$NON-NLS-1$
removeMenuItem.setImage( PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_TOOL_DELETE ) );
removeMenuItem.addListener( SWT.Selection, new Listener()
{
@@ -446,12 +446,12 @@
&& ( !initialLowerCasedAliases.contains( alias.toLowerCase() ) ) )
{
errorComposite.setVisible( true );
- errorLabel.setText( Messages.getString( "EditAliasesDialog.ElementWithSameAliasExists" ) );
+ errorLabel.setText( Messages.getString( "EditAliasesDialog.ElementWithSameAliasExists" ) ); //$NON-NLS-1$
}
else if ( !PluginUtils.verifyName( alias ) )
{
errorComposite.setVisible( true );
- errorLabel.setText( NLS.bind( Messages.getString( "EditAliasesDialog.TheAliasBegin" ), new String[]
+ errorLabel.setText( NLS.bind( Messages.getString( "EditAliasesDialog.TheAliasBegin" ), new String[] //$NON-NLS-1$
{ alias } ) );
}
}
@@ -464,7 +464,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "EditAliasesDialog.EditAlias" ) );
+ newShell.setText( Messages.getString( "EditAliasesDialog.EditAlias" ) ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java Thu Oct 22 06:40:43 2009
@@ -93,7 +93,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "ObjectClassSelectionDialog.ClassSelection" ) );
+ newShell.setText( Messages.getString( "ObjectClassSelectionDialog.ClassSelection" ) ); //$NON-NLS-1$
}
@@ -107,7 +107,7 @@
composite.setLayout( layout );
Label chooseLabel = new Label( composite, SWT.NONE );
- chooseLabel.setText( Messages.getString( "ObjectClassSelectionDialog.ChooseClass" ) );
+ chooseLabel.setText( Messages.getString( "ObjectClassSelectionDialog.ChooseClass" ) ); //$NON-NLS-1$
chooseLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
searchText = new Text( composite, SWT.BORDER );
@@ -131,7 +131,7 @@
} );
Label matchingLabel = new Label( composite, SWT.NONE );
- matchingLabel.setText( Messages.getString( "ObjectClassSelectionDialog.MatchingClasses" ) );
+ matchingLabel.setText( Messages.getString( "ObjectClassSelectionDialog.MatchingClasses" ) ); //$NON-NLS-1$
matchingLabel.setLayoutData( new GridData( SWT.FILL, SWT.None, true, false ) );
objectClassesTable = new Table( composite, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
@@ -250,8 +250,8 @@
if ( selection.isEmpty() )
{
- MessageDialog.openError( getShell(), Messages.getString( "ObjectClassSelectionDialog.InvalidSelection" ),
- Messages.getString( "ObjectClassSelectionDialog.MustChooseClass" ) );
+ MessageDialog.openError( getShell(), Messages.getString( "ObjectClassSelectionDialog.InvalidSelection" ), //$NON-NLS-1$
+ Messages.getString( "ObjectClassSelectionDialog.MustChooseClass" ) ); //$NON-NLS-1$
return;
}
else
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/PreviousSearchesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/PreviousSearchesDialog.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/PreviousSearchesDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/PreviousSearchesDialog.java Thu Oct 22 06:40:43 2009
@@ -82,7 +82,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "PreviousSearchesDialog.Previous" ) );
+ newShell.setText( Messages.getString( "PreviousSearchesDialog.Previous" ) ); //$NON-NLS-1$
}
@@ -96,7 +96,7 @@
composite.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
Label label = new Label( composite, SWT.NONE );
- label.setText( Messages.getString( "PreviousSearchesDialog.ShowResultsInView" ) );
+ label.setText( Messages.getString( "PreviousSearchesDialog.ShowResultsInView" ) ); //$NON-NLS-1$
label.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
tableViewer = new TableViewer( composite, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE );
@@ -129,7 +129,7 @@
} );
removeButton = new Button( composite, SWT.NONE );
- removeButton.setText( Messages.getString( "PreviousSearchesDialog.Remove" ) );
+ removeButton.setText( Messages.getString( "PreviousSearchesDialog.Remove" ) ); //$NON-NLS-1$
removeButton.setLayoutData( new GridData( SWT.NONE, SWT.BEGINNING, false, false ) );
removeButton.setEnabled( false );
removeButton.addSelectionListener( new SelectionAdapter()
@@ -164,7 +164,7 @@
protected void createButtonsForButtonBar( Composite parent )
{
createButton( parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false );
- openButton = createButton( parent, IDialogConstants.OK_ID, Messages.getString( "PreviousSearchesDialog.Open" ),
+ openButton = createButton( parent, IDialogConstants.OK_ID, Messages.getString( "PreviousSearchesDialog.Open" ), //$NON-NLS-1$
true );
openButton.setEnabled( false );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/RenameProjectDialog.java Thu Oct 22 06:40:43 2009
@@ -86,7 +86,7 @@
protected void configureShell( Shell newShell )
{
super.configureShell( newShell );
- newShell.setText( Messages.getString( "RenameProjectDialog.Rename" ) );
+ newShell.setText( Messages.getString( "RenameProjectDialog.Rename" ) ); //$NON-NLS-1$
}
@@ -101,7 +101,7 @@
// New Name
Label newNameLabel = new Label( composite, SWT.NONE );
- newNameLabel.setText( Messages.getString( "RenameProjectDialog.NewName" ) );
+ newNameLabel.setText( Messages.getString( "RenameProjectDialog.NewName" ) ); //$NON-NLS-1$
newNameText = new Text( composite, SWT.BORDER );
newNameText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
newNameText.setText( originalName );
@@ -142,7 +142,7 @@
// Error Label
errorLabel = new Label( errorComposite, SWT.NONE );
errorLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
- errorLabel.setText( Messages.getString( "RenameProjectDialog.NameExists" ) );
+ errorLabel.setText( Messages.getString( "RenameProjectDialog.NameExists" ) ); //$NON-NLS-1$
newNameText.setFocus();
newNameText.selectAll();
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=828324&r1=828323&r2=828324&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 Thu Oct 22 06:40:43 2009
@@ -88,7 +88,7 @@
{
if ( !sourceCode.canLeaveThePage() )
{
- notifyError( Messages.getString( "AttributeTypeEditor.CodeErrors" ) );
+ notifyError( Messages.getString( "AttributeTypeEditor.CodeErrors" ) ); //$NON-NLS-1$
return;
}
@@ -193,7 +193,7 @@
// Verifying if there is an error on the source code page
if ( !sourceCode.canLeaveThePage() )
{
- notifyError( Messages.getString( "AttributeTypeEditor.AttributeErrors" ) );
+ notifyError( Messages.getString( "AttributeTypeEditor.AttributeErrors" ) ); //$NON-NLS-1$
monitor.setCanceled( true );
return;
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Thu Oct 22 06:40:43 2009
@@ -100,7 +100,7 @@
*/
public String getToolTipText()
{
- return NLS.bind( Messages.getString( "AttributeTypeEditorInput.FromSchema" ), new String[]
+ return NLS.bind( Messages.getString( "AttributeTypeEditorInput.FromSchema" ), new String[] //$NON-NLS-1$
{ getName(), attributeType.getSchema() } );
}
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=828324&r1=828323&r2=828324&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 Thu Oct 22 06:40:43 2009
@@ -334,13 +334,13 @@
else
{
oidText.setForeground( ViewUtils.COLOR_RED );
- oidText.setToolTipText( Messages.getString( "AttributeTypeEditorOverviewPage.ElementOIDExists" ) );
+ oidText.setToolTipText( Messages.getString( "AttributeTypeEditorOverviewPage.ElementOIDExists" ) ); //$NON-NLS-1$
}
}
else
{
oidText.setForeground( ViewUtils.COLOR_RED );
- oidText.setToolTipText( Messages.getString( "AttributeTypeEditorOverviewPage.MalformedOID" ) );
+ oidText.setToolTipText( Messages.getString( "AttributeTypeEditorOverviewPage.MalformedOID" ) ); //$NON-NLS-1$
}
}
};
@@ -679,7 +679,7 @@
*/
public AttributeTypeEditorOverviewPage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "AttributeTypeEditorOverviewPage.Overview" ) );
+ super( editor, ID, Messages.getString( "AttributeTypeEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
schemaHandler.addListener( schemaHandlerListener );
}
@@ -733,9 +733,9 @@
Section section_general_information = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
section_general_information.setDescription( Messages
- .getString( "AttributeTypeEditorOverviewPage.SpecifyGeneralInformation" ) );
+ .getString( "AttributeTypeEditorOverviewPage.SpecifyGeneralInformation" ) ); //$NON-NLS-1$
section_general_information
- .setText( Messages.getString( "AttributeTypeEditorOverviewPage.GeneralInformation" ) );
+ .setText( Messages.getString( "AttributeTypeEditorOverviewPage.GeneralInformation" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite client_general_information = toolkit.createComposite( section_general_information );
@@ -748,7 +748,7 @@
// ALIASES Field
toolkit
- .createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Aliases" ) );
+ .createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Aliases" ) ); //$NON-NLS-1$
Composite aliasComposite = toolkit.createComposite( client_general_information );
GridLayout aliasCompositeGridLayout = new GridLayout( 2, false );
toolkit.paintBordersFor( aliasComposite );
@@ -759,17 +759,17 @@
aliasesText = toolkit.createText( aliasComposite, "" ); //$NON-NLS-1$
aliasesText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
aliasesButton = toolkit.createButton( aliasComposite, Messages
- .getString( "AttributeTypeEditorOverviewPage.EditAliases" ), SWT.PUSH );
+ .getString( "AttributeTypeEditorOverviewPage.EditAliases" ), SWT.PUSH ); //$NON-NLS-1$
aliasesButton.setLayoutData( new GridData( SWT.NONE, SWT.CENTER, false, false ) );
// OID Field
- toolkit.createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.OID" ) );
+ toolkit.createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.OID" ) ); //$NON-NLS-1$
oidText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$
oidText.setLayoutData( new GridData( SWT.FILL, 0, true, false ) );
// DESCRIPTION Field
toolkit.createLabel( client_general_information, Messages
- .getString( "AttributeTypeEditorOverviewPage.Description" ) );
+ .getString( "AttributeTypeEditorOverviewPage.Description" ) ); //$NON-NLS-1$
descriptionText = toolkit.createText( client_general_information, "", SWT.MULTI | SWT.V_SCROLL ); //$NON-NLS-1$
GridData descriptionGridData = new GridData( SWT.FILL, SWT.NONE, true, false );
descriptionGridData.heightHint = 42;
@@ -777,13 +777,13 @@
// SCHEMA Field
schemaLink = toolkit.createHyperlink( client_general_information, Messages
- .getString( "AttributeTypeEditorOverviewPage.Schema" ), SWT.WRAP );
+ .getString( "AttributeTypeEditorOverviewPage.Schema" ), SWT.WRAP ); //$NON-NLS-1$
schemaLabel = toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$
schemaLabel.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// SUP Combo
supLabel = toolkit.createHyperlink( client_general_information, Messages
- .getString( "AttributeTypeEditorOverviewPage.SuperiorType" ), SWT.WRAP );
+ .getString( "AttributeTypeEditorOverviewPage.SuperiorType" ), SWT.WRAP ); //$NON-NLS-1$
supCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
supCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
supComboViewer = new ComboViewer( supCombo );
@@ -791,14 +791,14 @@
supComboViewer.setLabelProvider( new ATESuperiorComboLabelProvider() );
// USAGE Combo
- toolkit.createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Usage" ) );
+ toolkit.createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Usage" ) ); //$NON-NLS-1$
usageCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
usageCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
initUsageCombo();
// SYNTAX Combo
toolkit
- .createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Syntax" ) );
+ .createLabel( client_general_information, Messages.getString( "AttributeTypeEditorOverviewPage.Syntax" ) ); //$NON-NLS-1$
syntaxCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
syntaxCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
syntaxComboViewer = new ComboViewer( syntaxCombo );
@@ -807,7 +807,7 @@
// SYNTAX LENGTH Field
toolkit.createLabel( client_general_information, Messages
- .getString( "AttributeTypeEditorOverviewPage.SyntaxLength" ) );
+ .getString( "AttributeTypeEditorOverviewPage.SyntaxLength" ) ); //$NON-NLS-1$
syntaxLengthText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$
syntaxLengthText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
@@ -824,18 +824,18 @@
// OBSOLETE Checkbox
obsoleteCheckbox = toolkit.createButton( propertiesComposite, Messages
- .getString( "AttributeTypeEditorOverviewPage.Obsolete" ), SWT.CHECK );
+ .getString( "AttributeTypeEditorOverviewPage.Obsolete" ), SWT.CHECK ); //$NON-NLS-1$
obsoleteCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// SINGLE-VALUE Checkbox
singleValueCheckbox = toolkit.createButton( propertiesComposite, Messages
- .getString( "AttributeTypeEditorOverviewPage.SingleValue" ), SWT.CHECK );
+ .getString( "AttributeTypeEditorOverviewPage.SingleValue" ), SWT.CHECK ); //$NON-NLS-1$
singleValueCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// COLLECTIVE Checkbox
toolkit.createLabel( client_general_information, "" ); // Filling the first column //$NON-NLS-1$
collectiveCheckbox = toolkit.createButton( propertiesComposite, Messages
- .getString( "AttributeTypeEditorOverviewPage.Collective" ), SWT.CHECK );
+ .getString( "AttributeTypeEditorOverviewPage.Collective" ), SWT.CHECK ); //$NON-NLS-1$
collectiveCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// NO-USER-MODIFICATION Checkbox
@@ -858,8 +858,8 @@
Section section_matching_rules = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
section_matching_rules.setDescription( Messages
- .getString( "AttributeTypeEditorOverviewPage.SpecifyMatchingRules" ) );
- section_matching_rules.setText( Messages.getString( "AttributeTypeEditorOverviewPage.MatchingRules" ) );
+ .getString( "AttributeTypeEditorOverviewPage.SpecifyMatchingRules" ) ); //$NON-NLS-1$
+ section_matching_rules.setText( Messages.getString( "AttributeTypeEditorOverviewPage.MatchingRules" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite client_matching_rules = toolkit.createComposite( section_matching_rules );
@@ -871,7 +871,7 @@
section_matching_rules.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
// EQUALITY Combo
- toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Equality" ) );
+ toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Equality" ) ); //$NON-NLS-1$
equalityCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
equalityCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
equalityComboViewer = new ComboViewer( equalityCombo );
@@ -879,7 +879,7 @@
equalityComboViewer.setLabelProvider( new ATEMatchingRulesComboLabelProvider() );
// ORDERING Combo
- toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Ordering" ) );
+ toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Ordering" ) ); //$NON-NLS-1$
orderingCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
orderingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
orderingComboViewer = new ComboViewer( orderingCombo );
@@ -887,7 +887,7 @@
orderingComboViewer.setLabelProvider( new ATEMatchingRulesComboLabelProvider() );
// SUBSTRING Combo
- toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Substring" ) );
+ toolkit.createLabel( client_matching_rules, Messages.getString( "AttributeTypeEditorOverviewPage.Substring" ) ); //$NON-NLS-1$
substringCombo = new Combo( client_matching_rules, SWT.READ_ONLY | SWT.SINGLE );
substringCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
substringComboViewer = new ComboViewer( substringCombo );
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=828324&r1=828323&r2=828324&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 Thu Oct 22 06:40:43 2009
@@ -106,7 +106,7 @@
*/
public AttributeTypeEditorSourceCodePage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "AttributeTypeEditorSourceCodePage.SourceCode" ) );
+ super( editor, ID, Messages.getString( "AttributeTypeEditorSourceCodePage.SourceCode" ) ); //$NON-NLS-1$
}
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=828324&r1=828323&r2=828324&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 Thu Oct 22 06:40:43 2009
@@ -210,7 +210,7 @@
*/
public AttributeTypeEditorUsedByPage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "AttributeTypeEditorUsedByPage.UsedBy" ) );
+ super( editor, ID, Messages.getString( "AttributeTypeEditorUsedByPage.UsedBy" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
schemaHandler.addListener( schemaHandlerListener );
}
@@ -277,7 +277,7 @@
.bind(
Messages.getString( "AttributeTypeEditorUsedByPage.AttributeTypeMandatory" ), new String[] { modifiedAttributeType.getOid() } ) ); //$NON-NLS-1$
}
- mandatoryAttributeSection.setText( Messages.getString( "AttributeTypeEditorUsedByPage.AsMandatoryAttribute" ) );
+ mandatoryAttributeSection.setText( Messages.getString( "AttributeTypeEditorUsedByPage.AsMandatoryAttribute" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite mandatoryAttributeSectionClient = toolkit.createComposite( mandatoryAttributeSection );
@@ -324,7 +324,7 @@
.bind(
Messages.getString( "AttributeTypeEditorUsedByPage.AttributeTypeOptional" ), new String[] { modifiedAttributeType.getOid() } ) ); //$NON-NLS-1$
}
- optionalAttributeSection.setText( Messages.getString( "AttributeTypeEditorUsedByPage.AsOptionalAttribute" ) );
+ optionalAttributeSection.setText( Messages.getString( "AttributeTypeEditorUsedByPage.AsOptionalAttribute" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite optionalAttributeSectionClient = toolkit.createComposite( optionalAttributeSection );
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=828324&r1=828323&r2=828324&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 Thu Oct 22 06:40:43 2009
@@ -87,7 +87,7 @@
{
if ( !sourceCode.canLeaveThePage() )
{
- notifyError( Messages.getString( "ObjectClassEditor.CodeError" ) );
+ notifyError( Messages.getString( "ObjectClassEditor.CodeError" ) ); //$NON-NLS-1$
return;
}
@@ -191,7 +191,7 @@
// Verifying if there is an error on the source code page
if ( !sourceCode.canLeaveThePage() )
{
- notifyError( Messages.getString( "ObjectClassEditor.CodeErrorObject" ) );
+ notifyError( Messages.getString( "ObjectClassEditor.CodeErrorObject" ) ); //$NON-NLS-1$
monitor.setCanceled( true );
return;
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorInput.java Thu Oct 22 06:40:43 2009
@@ -98,7 +98,7 @@
*/
public String getToolTipText()
{
- return NLS.bind( Messages.getString( "ObjectClassEditorInput.FromSchema" ), new String[]
+ return NLS.bind( Messages.getString( "ObjectClassEditorInput.FromSchema" ), new String[] //$NON-NLS-1$
{ getName(), objectClass.getSchema() } );
}