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 [2/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...
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Thu Oct 22 06:40:43 2009
@@ -307,7 +307,7 @@
}
else
{
- aliasesText.setText( "" );
+ aliasesText.setText( "" ); //$NON-NLS-1$
}
setEditorDirty();
}
@@ -335,13 +335,13 @@
else
{
oidText.setForeground( ViewUtils.COLOR_RED );
- oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.ElementOIDExists" ) );
+ oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.ElementOIDExists" ) ); //$NON-NLS-1$
}
}
else
{
oidText.setForeground( ViewUtils.COLOR_RED );
- oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.MalformedOID" ) );
+ oidText.setToolTipText( Messages.getString( "ObjectClassEditorOverviewPage.MalformedOID" ) ); //$NON-NLS-1$
}
}
};
@@ -852,7 +852,7 @@
*/
public ObjectClassEditorOverviewPage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "ObjectClassEditorOverviewPage.Overview" ) );
+ super( editor, ID, Messages.getString( "ObjectClassEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
schemaHandler.addListener( schemaHandlerListener );
}
@@ -915,8 +915,8 @@
Section section_general_information = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
section_general_information.setDescription( Messages
- .getString( "ObjectClassEditorOverviewPage.SpecifyGeneralInformation" ) );
- section_general_information.setText( Messages.getString( "ObjectClassEditorOverviewPage.GeneralInformation" ) );
+ .getString( "ObjectClassEditorOverviewPage.SpecifyGeneralInformation" ) ); //$NON-NLS-1$
+ section_general_information.setText( Messages.getString( "ObjectClassEditorOverviewPage.GeneralInformation" ) ); //$NON-NLS-1$
section_general_information.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// Creating the layout of the section
@@ -929,7 +929,7 @@
// Adding elements to the section
// ALIASES Button
- toolkit.createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.Aliases" ) );
+ toolkit.createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.Aliases" ) ); //$NON-NLS-1$
Composite aliasComposite = toolkit.createComposite( client_general_information );
GridLayout aliasCompositeGridLayout = new GridLayout( 2, false );
toolkit.paintBordersFor( aliasComposite );
@@ -940,23 +940,23 @@
aliasesText = toolkit.createText( aliasComposite, "" ); //$NON-NLS-1$
aliasesText.setLayoutData( new GridData( SWT.FILL, SWT.CENTER, true, false ) );
aliasesButton = toolkit.createButton( aliasComposite, Messages
- .getString( "ObjectClassEditorOverviewPage.EditAliases" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.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( "ObjectClassEditorOverviewPage.OID" ) );
+ toolkit.createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.OID" ) ); //$NON-NLS-1$
oidText = toolkit.createText( client_general_information, "" ); //$NON-NLS-1$
oidText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// SCHEMA Field
schemaLink = toolkit.createHyperlink( client_general_information, Messages
- .getString( "ObjectClassEditorOverviewPage.Schema" ), SWT.WRAP );
+ .getString( "ObjectClassEditorOverviewPage.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 ) );
// DESCRIPTION Field
toolkit.createLabel( client_general_information, Messages
- .getString( "ObjectClassEditorOverviewPage.Description" ) );
+ .getString( "ObjectClassEditorOverviewPage.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;
@@ -964,7 +964,7 @@
// SUPERIORS Table
toolkit.createLabel( client_general_information, Messages
- .getString( "ObjectClassEditorOverviewPage.SuperiorClasses" ) );
+ .getString( "ObjectClassEditorOverviewPage.SuperiorClasses" ) ); //$NON-NLS-1$
Composite superiorsComposite = toolkit.createComposite( client_general_information );
GridLayout superiorsCompositeGridLayout = new GridLayout( 2, false );
toolkit.paintBordersFor( superiorsComposite );
@@ -983,15 +983,15 @@
superiorsTableViewer.setContentProvider( new ObjectClassEditorSuperiorsTableContentProvider() );
superiorsTableViewer.setLabelProvider( new ObjectClassEditorSuperiorsTableLabelProvider() );
addButtonSuperiorsTable = toolkit.createButton( superiorsComposite, Messages
- .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); //$NON-NLS-1$
addButtonSuperiorsTable.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
removeButtonSuperiorsTable = toolkit.createButton( superiorsComposite, Messages
- .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); //$NON-NLS-1$
removeButtonSuperiorsTable.setLayoutData( new GridData( SWT.FILL, SWT.NONE, false, false ) );
// CLASS TYPE Combo
toolkit
- .createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.ClassType" ) );
+ .createLabel( client_general_information, Messages.getString( "ObjectClassEditorOverviewPage.ClassType" ) ); //$NON-NLS-1$
classTypeCombo = new Combo( client_general_information, SWT.READ_ONLY | SWT.SINGLE );
classTypeCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
initClassTypeCombo();
@@ -999,7 +999,7 @@
// OBSOLETE Checkbox
toolkit.createLabel( client_general_information, "" ); //$NON-NLS-1$
obsoleteCheckbox = toolkit.createButton( client_general_information, Messages
- .getString( "ObjectClassEditorOverviewPage.Obsolete" ), SWT.CHECK );
+ .getString( "ObjectClassEditorOverviewPage.Obsolete" ), SWT.CHECK ); //$NON-NLS-1$
obsoleteCheckbox.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
@@ -1016,8 +1016,8 @@
{
// MANDATORY ATTRIBUTES Section
Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR );
- section.setText( Messages.getString( "ObjectClassEditorOverviewPage.MandatoryAttributes" ) );
- section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyMandatoryAttributes" ) );
+ section.setText( Messages.getString( "ObjectClassEditorOverviewPage.MandatoryAttributes" ) ); //$NON-NLS-1$
+ section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyMandatoryAttributes" ) ); //$NON-NLS-1$
section.setExpanded( true );
Composite client = toolkit.createComposite( section );
section.setClient( client );
@@ -1040,9 +1040,9 @@
mandatoryAttributesTableViewer.setLabelProvider( new ObjectClassEditorAttributesTableLabelProvider() );
addButtonMandatoryTable = toolkit.createButton( client, Messages
- .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); //$NON-NLS-1$
removeButtonMandatoryTable = toolkit.createButton( client, Messages
- .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); //$NON-NLS-1$
gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING );
addButtonMandatoryTable.setLayoutData( gd );
removeButtonMandatoryTable.setLayoutData( gd );
@@ -1064,8 +1064,8 @@
{
// OPTIONAL ATTRIBUTES Section
Section section = toolkit.createSection( parent, Section.DESCRIPTION | Section.TITLE_BAR );
- section.setText( Messages.getString( "ObjectClassEditorOverviewPage.OptionalAttributes" ) );
- section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyOptionalAttributes" ) );
+ section.setText( Messages.getString( "ObjectClassEditorOverviewPage.OptionalAttributes" ) ); //$NON-NLS-1$
+ section.setDescription( Messages.getString( "ObjectClassEditorOverviewPage.SpecifyOptionalAttributes" ) ); //$NON-NLS-1$
section.setExpanded( true );
Composite client = toolkit.createComposite( section );
section.setClient( client );
@@ -1088,9 +1088,9 @@
optionalAttributesTableViewer.setLabelProvider( new ObjectClassEditorAttributesTableLabelProvider() );
addButtonOptionalTable = toolkit.createButton( client,
- Messages.getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH );
+ Messages.getString( "ObjectClassEditorOverviewPage.Add" ), SWT.PUSH ); //$NON-NLS-1$
removeButtonOptionalTable = toolkit.createButton( client, Messages
- .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH );
+ .getString( "ObjectClassEditorOverviewPage.Remove" ), SWT.PUSH ); //$NON-NLS-1$
gd = new GridData( GridData.VERTICAL_ALIGN_BEGINNING );
addButtonOptionalTable.setLayoutData( gd );
removeButtonOptionalTable.setLayoutData( gd );
@@ -1160,9 +1160,9 @@
*/
private void initClassTypeCombo()
{
- classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Abstract" ), 0 );
- classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Auxiliary" ), 1 );
- classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Structural" ), 2 );
+ classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Abstract" ), 0 ); //$NON-NLS-1$
+ classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Auxiliary" ), 1 ); //$NON-NLS-1$
+ classTypeCombo.add( Messages.getString( "ObjectClassEditorOverviewPage.Structural" ), 2 ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorSourceCodePage.java Thu Oct 22 06:40:43 2009
@@ -149,7 +149,7 @@
// Help Context for Dynamic Help
PlatformUI.getWorkbench().getHelpSystem().setHelp( form,
- PluginConstants.PLUGIN_ID + "." + "object_class_editor" );
+ PluginConstants.PLUGIN_ID + "." + "object_class_editor" ); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java Thu Oct 22 06:40:43 2009
@@ -153,9 +153,9 @@
}
catch ( PartInitException exception )
{
- PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception );
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages
- .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) );
+ PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
}
}
}
@@ -182,9 +182,9 @@
}
catch ( PartInitException exception )
{
- PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception );
- ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages
- .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) );
+ PluginUtils.logError( Messages.getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ), exception ); //$NON-NLS-1$
+ ViewUtils.displayErrorMessageBox( Messages.getString( "SchemaEditorOverviewPage.Error" ), Messages //$NON-NLS-1$
+ .getString( "SchemaEditorOverviewPage.ErrorOpenEditor" ) ); //$NON-NLS-1$
}
}
}
@@ -199,7 +199,7 @@
*/
public SchemaEditorOverviewPage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "SchemaEditorOverviewPage.Overview" ) );
+ super( editor, ID, Messages.getString( "SchemaEditorOverviewPage.Overview" ) ); //$NON-NLS-1$
schemaHandler = Activator.getDefault().getSchemaHandler();
}
@@ -247,9 +247,9 @@
Section attributeTypesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
attributeTypesSection.setDescription( NLS.bind(
- Messages.getString( "SchemaEditorOverviewPage.SchemaAttribute" ), new String[]
+ Messages.getString( "SchemaEditorOverviewPage.SchemaAttribute" ), new String[] //$NON-NLS-1$
{ schema.getName() } ) );
- attributeTypesSection.setText( Messages.getString( "SchemaEditorOverviewPage.AttributeTypes" ) );
+ attributeTypesSection.setText( Messages.getString( "SchemaEditorOverviewPage.AttributeTypes" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite attributeTypesSectionClient = toolkit.createComposite( attributeTypesSection );
@@ -280,9 +280,9 @@
Section objectClassesSection = toolkit.createSection( parent, Section.DESCRIPTION | Section.EXPANDED
| Section.TITLE_BAR );
objectClassesSection.setDescription( NLS.bind( Messages
- .getString( "SchemaEditorOverviewPage.SchemaObjectClasses" ), new String[]
+ .getString( "SchemaEditorOverviewPage.SchemaObjectClasses" ), new String[] //$NON-NLS-1$
{ schema.getName() } ) );
- objectClassesSection.setText( Messages.getString( "SchemaEditorOverviewPage.ObjectClasses" ) );
+ objectClassesSection.setText( Messages.getString( "SchemaEditorOverviewPage.ObjectClasses" ) ); //$NON-NLS-1$
// Creating the layout of the section
Composite objectClassesSectionClient = toolkit.createComposite( objectClassesSection );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Thu Oct 22 06:40:43 2009
@@ -183,7 +183,7 @@
*/
public SchemaEditorSourceCodePage( FormEditor editor )
{
- super( editor, ID, Messages.getString( "SchemaEditorSourceCodePage.SourceCode" ) );
+ super( editor, ID, Messages.getString( "SchemaEditorSourceCodePage.SourceCode" ) ); //$NON-NLS-1$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Thu Oct 22 06:40:43 2009
@@ -294,7 +294,7 @@
Messages.getString( "ProblemsViewLabelProvider.AttributeTypeCollective" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
}
- return "";
+ return ""; //$NON-NLS-1$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProjectsView.java Thu Oct 22 06:40:43 2009
@@ -53,7 +53,7 @@
public void createPartControl( Composite parent )
{
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "projects_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "projects_view" ); //$NON-NLS-1$ //$NON-NLS-2$
initViewer( parent );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaView.java Thu Oct 22 06:40:43 2009
@@ -63,7 +63,7 @@
new SchemaViewController( this );
// Help Context for Dynamic Help
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "schema_view" );
+ PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, PluginConstants.PLUGIN_ID + "." + "schema_view" ); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java Thu Oct 22 06:40:43 2009
@@ -111,11 +111,11 @@
}
else if ( ( o1Names.length == 0 ) && ( o2Names.length > 0 ) )
{
- return "".compareToIgnoreCase( o2Names[0] );
+ return "".compareToIgnoreCase( o2Names[0] ); //$NON-NLS-1$
}
else if ( ( o1Names.length > 0 ) && ( o2Names.length == 0 ) )
{
- return o1Names[0].compareToIgnoreCase( "" );
+ return o1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/FirstNameSorter.java Thu Oct 22 06:40:43 2009
@@ -199,11 +199,11 @@
}
else if ( ( o1Names.length == 0 ) && ( o2Names.length > 0 ) )
{
- return "".compareToIgnoreCase( o2Names[0] );
+ return "".compareToIgnoreCase( o2Names[0] ); //$NON-NLS-1$
}
else if ( ( o1Names.length > 0 ) && ( o2Names.length == 0 ) )
{
- return o1Names[0].compareToIgnoreCase( "" );
+ return o1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/OidSorter.java Thu Oct 22 06:40:43 2009
@@ -38,8 +38,8 @@
*/
public int compare( Object o1, Object o2 )
{
- String oid1 = "";
- String oid2 = "";
+ String oid1 = ""; //$NON-NLS-1$
+ String oid2 = ""; //$NON-NLS-1$
if ( ( o1 instanceof AttributeTypeDifference ) && ( o2 instanceof AttributeTypeDifference ) )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/SchemaDifferenceSorter.java Thu Oct 22 06:40:43 2009
@@ -42,8 +42,8 @@
SchemaDifference sd1 = ( SchemaDifference ) o1;
SchemaDifference sd2 = ( SchemaDifference ) o2;
- String name1 = "";
- String name2 = "";
+ String name1 = ""; //$NON-NLS-1$
+ String name2 = ""; //$NON-NLS-1$
switch ( sd1.getType() )
{
case ADDED:
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportProjectsWizard.java Thu Oct 22 06:40:43 2009
@@ -111,7 +111,7 @@
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( FileNotFoundException e )
{
@@ -122,7 +122,7 @@
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( IOException e )
{
@@ -133,7 +133,7 @@
Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportProjectsWizard.Error" ), NLS.bind( Messages.getString( "ExportProjectsWizard.ErrorWhenSavingProject" ), new String[] { project.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsOpenLdapWizard.java Thu Oct 22 06:40:43 2009
@@ -107,7 +107,7 @@
e );
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportSchemasAsOpenLdapWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasAsOpenLdapWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsOpenLdapWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasAsXmlWizard.java Thu Oct 22 06:40:43 2009
@@ -109,7 +109,7 @@
Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportSchemasAsXmlWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasAsXmlWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasAsXmlWizard.ErrorWhenSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Thu Oct 22 06:40:43 2009
@@ -133,7 +133,7 @@
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
catch ( NamingException e )
{
@@ -144,7 +144,7 @@
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
monitor.worked( 1 );
}
@@ -195,7 +195,7 @@
Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ), e ); //$NON-NLS-1$
ViewUtils
.displayErrorMessageBox(
- Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$
+ Messages.getString( "ExportSchemasForADSWizard.Error" ), NLS.bind( Messages.getString( "ExportSchemasForADSWizard.ErrorSavingSchema" ), new String[] { schema.getName() } ) ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasOptionsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasOptionsWizardPage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasOptionsWizardPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasOptionsWizardPage.java Thu Oct 22 06:40:43 2009
@@ -68,21 +68,21 @@
composite.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
replaceUnknowNSyntaxButton = BaseWidgetUtils.createCheckbox( composite, Messages
- .getString( "MergeSchemasOptionsWizardPage.ReplaceUnknownSyntax" ), 1 );
+ .getString( "MergeSchemasOptionsWizardPage.ReplaceUnknownSyntax" ), 1 ); //$NON-NLS-1$
replaceUnknowNSyntaxButton.setToolTipText( Messages
- .getString( "MergeSchemasOptionsWizardPage.ReplaceUnknownSyntaxTooltip" ) );
+ .getString( "MergeSchemasOptionsWizardPage.ReplaceUnknownSyntaxTooltip" ) ); //$NON-NLS-1$
replaceUnknowNSyntaxButton.setSelection( true );
mergeDependenciesButton = BaseWidgetUtils.createCheckbox( composite, Messages
- .getString( "MergeSchemasOptionsWizardPage.MergeDependencies" ), 1 );
+ .getString( "MergeSchemasOptionsWizardPage.MergeDependencies" ), 1 ); //$NON-NLS-1$
mergeDependenciesButton.setToolTipText( Messages
- .getString( "MergeSchemasOptionsWizardPage.MergeDependenciesTooltip" ) );
+ .getString( "MergeSchemasOptionsWizardPage.MergeDependenciesTooltip" ) ); //$NON-NLS-1$
mergeDependenciesButton.setSelection( true );
pullUpAttributesButton = BaseWidgetUtils.createCheckbox( composite, Messages
- .getString( "MergeSchemasOptionsWizardPage.PullUpAttributes" ), 1 );
+ .getString( "MergeSchemasOptionsWizardPage.PullUpAttributes" ), 1 ); //$NON-NLS-1$
pullUpAttributesButton.setToolTipText( Messages
- .getString( "MergeSchemasOptionsWizardPage.PullUpAttributesTooltip" ) );
+ .getString( "MergeSchemasOptionsWizardPage.PullUpAttributesTooltip" ) ); //$NON-NLS-1$
pullUpAttributesButton.setSelection( true );
setControl( composite );
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java Thu Oct 22 06:40:43 2009
@@ -174,11 +174,11 @@
}
else if ( element instanceof ObjectClassFolder )
{
- return Messages.getString( "MergeSchemasSelectionWizardPage.ObjectClasses" );
+ return Messages.getString( "MergeSchemasSelectionWizardPage.ObjectClasses" ); //$NON-NLS-1$
}
else if ( element instanceof AttributeTypeFolder )
{
- return Messages.getString( "MergeSchemasSelectionWizardPage.AttributeTypes" );
+ return Messages.getString( "MergeSchemasSelectionWizardPage.AttributeTypes" ); //$NON-NLS-1$
}
else if ( element instanceof AttributeType )
{
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Thu Oct 22 06:40:43 2009
@@ -94,8 +94,8 @@
sb.append( errorMessage );
sb.append( '\n' );
}
- new MessageDialogWithTextarea( getShell(), Messages.getString( "MergeSchemasWizard.MergeResultTitle" ),
- Messages.getString( "MergeSchemasWizard.MergeResultMessage" ), sb.toString() ).open();
+ new MessageDialogWithTextarea( getShell(), Messages.getString( "MergeSchemasWizard.MergeResultTitle" ), //$NON-NLS-1$
+ Messages.getString( "MergeSchemasWizard.MergeResultMessage" ), sb.toString() ).open(); //$NON-NLS-1$
}
return true;
@@ -188,7 +188,7 @@
private Schema getTargetSchema( Project sourceProject, Project targetProject, Map<String, Schema> targetSchemas )
{
- String targetSchemaName = "merge-from-" + sourceProject.getName();
+ String targetSchemaName = "merge-from-" + sourceProject.getName(); //$NON-NLS-1$
Schema targetSchema = targetProject.getSchemaHandler().getSchema( targetSchemaName );
if ( targetSchema != null )
{
@@ -276,14 +276,14 @@
if ( targetAttributeType != null )
{
- errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.AttributeTypeExistsInTargetProject" ),
+ errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.AttributeTypeExistsInTargetProject" ), //$NON-NLS-1$
getIdString( sourceAttributeType ) ) );
}
else
{
if ( oidOrAliasAlreadyTaken )
{
- errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.OidOrAliasAlreadyTaken" ),
+ errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.OidOrAliasAlreadyTaken" ), //$NON-NLS-1$
getIdString( sourceAttributeType ) ) );
}
else
@@ -320,10 +320,10 @@
if ( clonedAttributeType.getSyntaxOid() == null
|| targetProject.getSchemaHandler().getSyntax( clonedAttributeType.getSyntaxOid() ) == null )
{
- errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.ReplacedSyntax" ),
+ errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.ReplacedSyntax" ), //$NON-NLS-1$
new String[]
{ getIdString( sourceAttributeType ), clonedAttributeType.getSyntaxOid(),
- "1.3.6.1.4.1.1466.115.121.1.15 (Directory String)" } ) );
+ "1.3.6.1.4.1.1466.115.121.1.15 (Directory String)" } ) ); //$NON-NLS-1$
clonedAttributeType.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.15" );
clonedAttributeType.setEqualityName( "caseIgnoreMatch" );
clonedAttributeType.setOrderingName( null );
@@ -400,14 +400,14 @@
if ( targetObjectClass != null )
{
- errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.ObjectClassExistsInTargetProject" ),
+ errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.ObjectClassExistsInTargetProject" ), //$NON-NLS-1$
getIdString( sourceObjectClass ) ) );
}
else
{
if ( oidOrAliasAlreadyTaken )
{
- errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.OidOrAliasAlreadyTaken" ),
+ errorMessages.add( NLS.bind( Messages.getString( "MergeSchemasWizard.OidOrAliasAlreadyTaken" ), //$NON-NLS-1$
getIdString( sourceObjectClass ) ) );
}
else
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizard.java Thu Oct 22 06:40:43 2009
@@ -109,7 +109,7 @@
if ( correctSchemaConnectors.size() == 0 )
{
monitor.reportError(
- "No suitable SchemaConnector has been found for the choosen Directory Server.",
+ "No suitable SchemaConnector has been found for the choosen Directory Server.", //$NON-NLS-1$
new NoSuitableSchemaConnectorException() );
}
Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java?rev=828324&r1=828323&r2=828324&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java Thu Oct 22 06:40:43 2009
@@ -82,11 +82,11 @@
}
else if ( ( o1Names.length == 0 ) && ( o2Names.length > 0 ) )
{
- return "".compareToIgnoreCase( o2Names[0] );
+ return "".compareToIgnoreCase( o2Names[0] ); //$NON-NLS-1$
}
else if ( ( o1Names.length > 0 ) && ( o2Names.length == 0 ) )
{
- return o1Names[0].compareToIgnoreCase( "" );
+ return o1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}