directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r720901 - /directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/
Date Wed, 26 Nov 2008 15:36:14 GMT
Author: felixk
Date: Wed Nov 26 07:36:13 2008
New Revision: 720901

URL: http://svn.apache.org/viewvc?rev=720901&view=rev
Log:
Formatting

Modified:
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewSortingDialog.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewSortingDialog.java

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Wed Nov 26 07:36:13 2008
@@ -185,9 +185,10 @@
         }
         else
         {
-            sb.append( Messages.getString("HierarchyView.None") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "HierarchyView.None" ) ); //$NON-NLS-1$
         }
-        sb.append( NLS.bind( Messages.getString("HierarchyView.Schema"), new String[]{object.getOid(), object.getSchema()}) ); //$NON-NLS-1$
+        sb.append( NLS.bind(
+            Messages.getString( "HierarchyView.Schema" ), new String[] { object.getOid(), object.getSchema() } ) ); //$NON-NLS-1$
 
         overviewLabel.setText( sb.toString() );
     }

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Wed Nov 26 07:36:13 2008
@@ -92,7 +92,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
@@ -104,7 +104,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID )
@@ -121,7 +121,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -145,7 +145,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
@@ -157,7 +157,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID )
@@ -174,7 +174,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -202,7 +202,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
@@ -214,7 +214,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID )
@@ -235,7 +235,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_ALL_ALIASES )
@@ -247,7 +247,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("HierarchyViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "HierarchyViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_OID )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsView.java Wed Nov 26 07:36:13 2008
@@ -113,10 +113,10 @@
         tree.setHeaderVisible( true );
         tree.setLinesVisible( true );
         TreeColumn descriptionColumn = new TreeColumn( tree, SWT.LEFT );
-        descriptionColumn.setText( Messages.getString("ProblemsView.Description") ); //$NON-NLS-1$
+        descriptionColumn.setText( Messages.getString( "ProblemsView.Description" ) ); //$NON-NLS-1$
         descriptionColumn.setWidth( 500 );
         TreeColumn resourceColumn = new TreeColumn( tree, SWT.LEFT );
-        resourceColumn.setText( Messages.getString("ProblemsView.Resource") ); //$NON-NLS-1$
+        resourceColumn.setText( Messages.getString( "ProblemsView.Resource" ) ); //$NON-NLS-1$
         resourceColumn.setWidth( 100 );
         contentProvider = new ProblemsViewContentProvider();
         treeViewer.setContentProvider( contentProvider );
@@ -181,11 +181,11 @@
         sb.append( " " ); //$NON-NLS-1$
         if ( errors > 1 )
         {
-            sb.append( Messages.getString("ProblemsView.Errors") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "ProblemsView.Errors" ) ); //$NON-NLS-1$
         }
         else
         {
-            sb.append( Messages.getString("ProblemsView.Error") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "ProblemsView.Error" ) ); //$NON-NLS-1$
         }
 
         sb.append( ", " ); //$NON-NLS-1$
@@ -194,11 +194,11 @@
         sb.append( " " ); //$NON-NLS-1$
         if ( warnings > 1 )
         {
-            sb.append( Messages.getString("ProblemsView.Warnings") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "ProblemsView.Warnings" ) ); //$NON-NLS-1$
         }
         else
         {
-            sb.append( Messages.getString("ProblemsView.Warning") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "ProblemsView.Warning" ) ); //$NON-NLS-1$
         }
 
         overviewLabel.setText( sb.toString() );

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=720901&r1=720900&r2=720901&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 Wed Nov 26 07:36:13 2008
@@ -149,11 +149,15 @@
             SchemaObject duplicate = duplicateAliasError.getDuplicate();
             if ( duplicate instanceof AttributeTypeImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType" ), new String[]{duplicateAliasError.getAlias(), duplicate.getOid()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType" ), new String[] { duplicateAliasError.getAlias(), duplicate.getOid() } ); //$NON-NLS-1$
             }
             else if ( duplicate instanceof ObjectClassImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass" ), new String[]{duplicateAliasError.getAlias(), duplicate.getOid()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass" ), new String[] { duplicateAliasError.getAlias(), duplicate.getOid() } ); //$NON-NLS-1$
             }
         }
         else if ( element instanceof DuplicateOidError )
@@ -162,42 +166,58 @@
             SchemaObject duplicate = duplicateOidError.getDuplicate();
             if ( duplicate instanceof AttributeTypeImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.DuplicateOidErrorAttributeType" ), new String[]{duplicateOidError.getOid(), duplicate.getName()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.DuplicateOidErrorAttributeType" ), new String[] { duplicateOidError.getOid(), duplicate.getName() } ); //$NON-NLS-1$
             }
             else if ( duplicate instanceof ObjectClassImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.DuplicateOidErrorObjectClass" ), new String[]{duplicateOidError.getOid(), duplicate.getName()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.DuplicateOidErrorObjectClass" ), new String[] { duplicateOidError.getOid(), duplicate.getName() } ); //$NON-NLS-1$
             }
         }
         else if ( element instanceof NonExistingATSuperiorError )
         {
             NonExistingATSuperiorError nonExistingATSuperiorError = ( NonExistingATSuperiorError ) element;
-            return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NonExistingSuperiorAttribute"), new String[]{nonExistingATSuperiorError.getSuperiorAlias()}); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSuperiorAttribute" ), new String[] { nonExistingATSuperiorError.getSuperiorAlias() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NonExistingOCSuperiorError )
         {
             NonExistingOCSuperiorError nonExistingOCSuperiorError = ( NonExistingOCSuperiorError ) element;
-            return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.NonExistingSuperiorObject"), new String[]{nonExistingOCSuperiorError.getSuperiorAlias()} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSuperiorObject" ), new String[] { nonExistingOCSuperiorError.getSuperiorAlias() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NonExistingMandatoryATError )
         {
             NonExistingMandatoryATError nonExistingMandatoryATError = ( NonExistingMandatoryATError ) element;
-            return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NonExistingMandatoryAttribute"), new String[]{ nonExistingMandatoryATError.getAlias()} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingMandatoryAttribute" ), new String[] { nonExistingMandatoryATError.getAlias() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NonExistingOptionalATError )
         {
             NonExistingOptionalATError nonExistingOptionalATError = ( NonExistingOptionalATError ) element;
-            return NLS.bind(Messages.getString("ProblemsViewLabelProvider.NonExistingOptionalAttribute"), new String[]{ nonExistingOptionalATError.getAlias() } ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingOptionalAttribute" ), new String[] { nonExistingOptionalATError.getAlias() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NonExistingSyntaxError )
         {
             NonExistingSyntaxError nonExistingSyntaxError = ( NonExistingSyntaxError ) element;
-            return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NonExistingSyntax"), new String[]{nonExistingSyntaxError.getSyntaxOid()} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSyntax" ), new String[] { nonExistingSyntaxError.getSyntaxOid() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NonExistingMatchingRuleError )
         {
             NonExistingMatchingRuleError nonExistingMatchingRuleError = ( NonExistingMatchingRuleError ) element;
-            return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NonExistingMatchingRule"), new String[]{nonExistingMatchingRuleError.getMatchingRuleAlias()} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.NonExistingMatchingRule" ), new String[] { nonExistingMatchingRuleError.getMatchingRuleAlias() } ); //$NON-NLS-1$
         }
         else if ( element instanceof NoAliasWarning )
         {
@@ -205,11 +225,15 @@
             SchemaObject source = noAliasWarning.getSource();
             if ( source instanceof AttributeTypeImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NoAliasWarningAttributeType"), new String[]{source.getOid()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
             }
             else if ( source instanceof ObjectClassImpl )
             {
-                return NLS.bind( Messages.getString("ProblemsViewLabelProvider.NoAliasWarningObjectClass"), new String[]{source.getOid()} ); //$NON-NLS-1$
+                return NLS
+                    .bind(
+                        Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningObjectClass" ), new String[] { source.getOid() } ); //$NON-NLS-1$
             }
         }
         else if ( element instanceof ClassTypeHierarchyError )
@@ -221,20 +245,33 @@
             {
                 if ( superior.getType().equals( ObjectClassTypeEnum.STRUCTURAL ) )
                 {
-                    return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject"), new String[]{getDisplayName( source ), getDisplayName( superior )} ); //$NON-NLS-1$
+                    return NLS
+                        .bind(
+                            Messages
+                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
                 }
                 else if ( superior.getType().equals( ObjectClassTypeEnum.AUXILIARY ) )
                 {
-                    return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject"), new String[]{getDisplayName( source ), getDisplayName( superior )} ); //$NON-NLS-1$
+                    return NLS
+                        .bind(
+                            Messages
+                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
                 }
             }
             else if ( source.getType().equals( ObjectClassTypeEnum.AUXILIARY ) )
             {
                 if ( superior.getType().equals( ObjectClassTypeEnum.STRUCTURAL ) )
                 {
-                    return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject"), new String[]{getDisplayName( source ), getDisplayName( superior )} ); //$NON-NLS-1$
-                }else{
-                    return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary"), new String[]{getDisplayName( source )} ); //$NON-NLS-1$
+                    return NLS
+                        .bind(
+                            Messages
+                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
+                }
+                else
+                {
+                    return NLS
+                        .bind(
+                            Messages.getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary" ), new String[] { getDisplayName( source ) } ); //$NON-NLS-1$
                 }
             }
         }
@@ -243,14 +280,18 @@
             DifferentUsageAsSuperiorError differentUsageAsSuperiorError = ( DifferentUsageAsSuperiorError ) element;
             AttributeTypeImpl source = ( AttributeTypeImpl ) differentUsageAsSuperiorError.getSource();
             AttributeTypeImpl superior = ( AttributeTypeImpl ) differentUsageAsSuperiorError.getSuperior();
-            return NLS.bind(  Messages.getString("ProblemsViewLabelProvider.AttributeTypeUsage"),new String[]{ getDisplayName( source ),getDisplayName( superior )} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.AttributeTypeUsage" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
         }
         else if ( element instanceof DifferentCollectiveAsSuperiorError )
         {
             DifferentCollectiveAsSuperiorError differentCollectiveAsSuperiorError = ( DifferentCollectiveAsSuperiorError ) element;
             AttributeTypeImpl source = ( AttributeTypeImpl ) differentCollectiveAsSuperiorError.getSource();
             AttributeTypeImpl superior = ( AttributeTypeImpl ) differentCollectiveAsSuperiorError.getSuperior();
-            return NLS.bind( Messages.getString("ProblemsViewLabelProvider.AttributeTypeCollective"), new String[]{ getDisplayName( source ), getDisplayName( superior )} ); //$NON-NLS-1$
+            return NLS
+                .bind(
+                    Messages.getString( "ProblemsViewLabelProvider.AttributeTypeCollective" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
         }
 
         return "";

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Wed Nov 26 07:36:13 2008
@@ -97,7 +97,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
@@ -109,7 +109,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_OID )
@@ -126,7 +126,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -150,7 +150,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
@@ -162,7 +162,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_OID )
@@ -179,7 +179,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -220,7 +220,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
@@ -232,7 +232,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_OID )
@@ -253,7 +253,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_ALL_ALIASES )
@@ -265,7 +265,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SchemaViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SchemaViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_OID )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewSortingDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewSortingDialog.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewSortingDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewSortingDialog.java Wed Nov 26 07:36:13 2008
@@ -72,7 +72,7 @@
     protected void configureShell( Shell newShell )
     {
         super.configureShell( newShell );
-        newShell.setText( Messages.getString("SchemaViewSortingDialog.ViewSorting") ); //$NON-NLS-1$
+        newShell.setText( Messages.getString( "SchemaViewSortingDialog.ViewSorting" ) ); //$NON-NLS-1$
     }
 
 
@@ -87,23 +87,23 @@
         // Grouping Group
         Group groupingGroup = new Group( composite, SWT.NONE );
         groupingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-        groupingGroup.setText( Messages.getString("SchemaViewSortingDialog.Grouping") ); //$NON-NLS-1$
+        groupingGroup.setText( Messages.getString( "SchemaViewSortingDialog.Grouping" ) ); //$NON-NLS-1$
         groupingGroup.setLayout( new GridLayout() );
 
         // Attribute Types first Button
         inFoldersButton = new Button( groupingGroup, SWT.RADIO );
-        inFoldersButton.setText( Messages.getString("SchemaViewSortingDialog.GroupTypesAndClasses") ); //$NON-NLS-1$
+        inFoldersButton.setText( Messages.getString( "SchemaViewSortingDialog.GroupTypesAndClasses" ) ); //$NON-NLS-1$
         inFoldersButton.setEnabled( true );
 
         // Mixed Button
         mixedButton = new Button( groupingGroup, SWT.RADIO );
-        mixedButton.setText( Messages.getString("SchemaViewSortingDialog.Mixed") ); //$NON-NLS-1$
+        mixedButton.setText( Messages.getString( "SchemaViewSortingDialog.Mixed" ) ); //$NON-NLS-1$
         mixedButton.setEnabled( true );
 
         // Sorting Group
         Group sortingGroup = new Group( composite, SWT.NONE );
         sortingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-        sortingGroup.setText( Messages.getString("SchemaViewSortingDialog.Sorting") ); //$NON-NLS-1$
+        sortingGroup.setText( Messages.getString( "SchemaViewSortingDialog.Sorting" ) ); //$NON-NLS-1$
         sortingGroup.setLayout( new GridLayout() );
         Composite sortingGroupComposite = new Composite( sortingGroup, SWT.NONE );
         GridLayout gl = new GridLayout( 4, false );
@@ -113,23 +113,25 @@
 
         // Sort by Label
         Label sortByLabel = new Label( sortingGroupComposite, SWT.NONE );
-        sortByLabel.setText( Messages.getString("SchemaViewSortingDialog.SortBy") ); //$NON-NLS-1$
+        sortByLabel.setText( Messages.getString( "SchemaViewSortingDialog.SortBy" ) ); //$NON-NLS-1$
 
         // Sorting Combo
         sortingCombo = new Combo( sortingGroupComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER );
         sortingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        sortingCombo.setItems( new String[]
-            { Messages.getString("SchemaViewSortingDialog.FirstName"), Messages.getString("SchemaViewSortingDialog.OID") } ); //$NON-NLS-1$ //$NON-NLS-2$
+        sortingCombo
+            .setItems( new String[]
+                {
+                    Messages.getString( "SchemaViewSortingDialog.FirstName" ), Messages.getString( "SchemaViewSortingDialog.OID" ) } ); //$NON-NLS-1$ //$NON-NLS-2$
         sortingCombo.setEnabled( true );
 
         // Ascending Button
         ascendingButton = new Button( sortingGroupComposite, SWT.RADIO );
-        ascendingButton.setText( Messages.getString("SchemaViewSortingDialog.Ascending") ); //$NON-NLS-1$
+        ascendingButton.setText( Messages.getString( "SchemaViewSortingDialog.Ascending" ) ); //$NON-NLS-1$
         ascendingButton.setEnabled( true );
 
         // Descending Button
         descendingButton = new Button( sortingGroupComposite, SWT.RADIO );
-        descendingButton.setText( Messages.getString("SchemaViewSortingDialog.Descending") ); //$NON-NLS-1$
+        descendingButton.setText( Messages.getString( "SchemaViewSortingDialog.Descending" ) ); //$NON-NLS-1$
         descendingButton.setEnabled( true );
 
         initFieldsFromPreferences();
@@ -198,12 +200,14 @@
                     PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED );
             }
 
-            if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals( Messages.getString("SchemaViewSortingDialog.FirstName") ) ) //$NON-NLS-1$
+            if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals(
+                Messages.getString( "SchemaViewSortingDialog.FirstName" ) ) ) //$NON-NLS-1$
             {
                 store.setValue( PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY,
                     PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY_FIRSTNAME );
             }
-            else if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals( Messages.getString("SchemaViewSortingDialog.OID") ) ) //$NON-NLS-1$
+            else if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals(
+                Messages.getString( "SchemaViewSortingDialog.OID" ) ) ) //$NON-NLS-1$
             {
                 store.setValue( PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY,
                     PluginConstants.PREFS_SCHEMA_VIEW_SORTING_BY_OID );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Wed Nov 26 07:36:13 2008
@@ -178,7 +178,7 @@
 
         // Search Label
         Label searchFieldLabel = new Label( searchFieldInnerComposite, SWT.NONE );
-        searchFieldLabel.setText( Messages.getString("SearchView.SearchColon") ); //$NON-NLS-1$
+        searchFieldLabel.setText( Messages.getString( "SearchView.SearchColon" ) ); //$NON-NLS-1$
         searchFieldLabel.setLayoutData( new GridData( SWT.NONE, SWT.CENTER, false, false ) );
 
         // Search Text Field
@@ -214,7 +214,7 @@
         final ToolBar searchToolBar = new ToolBar( searchFieldInnerComposite, SWT.HORIZONTAL | SWT.FLAT );
         // Creating the Search In ToolItem
         final ToolItem searchInToolItem = new ToolItem( searchToolBar, SWT.DROP_DOWN );
-        searchInToolItem.setText( Messages.getString("SearchView.SearchIn") ); //$NON-NLS-1$
+        searchInToolItem.setText( Messages.getString( "SearchView.SearchIn" ) ); //$NON-NLS-1$
         // Adding the action to display the Menu when the item is clicked
         searchInToolItem.addSelectionListener( new SelectionAdapter()
         {
@@ -233,7 +233,7 @@
         new ToolItem( searchToolBar, SWT.SEPARATOR );
 
         final ToolItem scopeToolItem = new ToolItem( searchToolBar, SWT.DROP_DOWN );
-        scopeToolItem.setText( Messages.getString("SearchView.Scope") ); //$NON-NLS-1$
+        scopeToolItem.setText( Messages.getString( "SearchView.Scope" ) ); //$NON-NLS-1$
         // Adding the action to display the Menu when the item is clicked
         scopeToolItem.addSelectionListener( new SelectionAdapter()
         {
@@ -254,7 +254,7 @@
         searchButton = new Button( searchFieldInnerComposite, SWT.PUSH | SWT.DOWN );
         searchButton.setEnabled( false );
         searchButton.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SEARCH ) );
-        searchButton.setToolTipText( Messages.getString("SearchView.Search") ); //$NON-NLS-1$
+        searchButton.setToolTipText( Messages.getString( "SearchView.Search" ) ); //$NON-NLS-1$
         searchButton.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -286,7 +286,7 @@
         // Filling the menu
         // Aliases
         final MenuItem aliasesMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        aliasesMenuItem.setText( Messages.getString("SearchView.Aliases") ); //$NON-NLS-1$
+        aliasesMenuItem.setText( Messages.getString( "SearchView.Aliases" ) ); //$NON-NLS-1$
         aliasesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -296,7 +296,7 @@
         } );
         // OID
         final MenuItem oidMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        oidMenuItem.setText( Messages.getString("SearchView.OID") ); //$NON-NLS-1$
+        oidMenuItem.setText( Messages.getString( "SearchView.OID" ) ); //$NON-NLS-1$
         oidMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -306,7 +306,7 @@
         } );
         // Description
         final MenuItem descriptionMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        descriptionMenuItem.setText( Messages.getString("SearchView.Description") ); //$NON-NLS-1$
+        descriptionMenuItem.setText( Messages.getString( "SearchView.Description" ) ); //$NON-NLS-1$
         descriptionMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -319,7 +319,7 @@
         new MenuItem( searchInMenu, SWT.SEPARATOR );
         // Superior
         final MenuItem superiorMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        superiorMenuItem.setText( Messages.getString("SearchView.Superior") ); //$NON-NLS-1$
+        superiorMenuItem.setText( Messages.getString( "SearchView.Superior" ) ); //$NON-NLS-1$
         superiorMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -329,7 +329,7 @@
         } );
         // Syntax
         final MenuItem syntaxMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        syntaxMenuItem.setText( Messages.getString("SearchView.Syntax") ); //$NON-NLS-1$
+        syntaxMenuItem.setText( Messages.getString( "SearchView.Syntax" ) ); //$NON-NLS-1$
         syntaxMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -339,7 +339,7 @@
         } );
         // Matching Rules
         final MenuItem matchingRulesMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        matchingRulesMenuItem.setText( Messages.getString("SearchView.MatchingRules") ); //$NON-NLS-1$
+        matchingRulesMenuItem.setText( Messages.getString( "SearchView.MatchingRules" ) ); //$NON-NLS-1$
         matchingRulesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -352,7 +352,7 @@
         new MenuItem( searchInMenu, SWT.SEPARATOR );
         // Superiors
         final MenuItem superiorsMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        superiorsMenuItem.setText( Messages.getString("SearchView.Superiors") ); //$NON-NLS-1$
+        superiorsMenuItem.setText( Messages.getString( "SearchView.Superiors" ) ); //$NON-NLS-1$
         superiorsMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -362,7 +362,7 @@
         } );
         // Mandatory Attributes
         final MenuItem mandatoryAttributesMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        mandatoryAttributesMenuItem.setText( Messages.getString("SearchView.MandatoryAttributes") ); //$NON-NLS-1$
+        mandatoryAttributesMenuItem.setText( Messages.getString( "SearchView.MandatoryAttributes" ) ); //$NON-NLS-1$
         mandatoryAttributesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -373,7 +373,7 @@
         } );
         // Optional Attributes
         final MenuItem optionalAttributesMenuItem = new MenuItem( searchInMenu, SWT.CHECK );
-        optionalAttributesMenuItem.setText( Messages.getString("SearchView.OptionalAttributes") ); //$NON-NLS-1$
+        optionalAttributesMenuItem.setText( Messages.getString( "SearchView.OptionalAttributes" ) ); //$NON-NLS-1$
         optionalAttributesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -442,7 +442,7 @@
         // Filling the menu
         // Attribute Types And Object Classes
         final MenuItem attributeTypesAndObjectClassesMenuItem = new MenuItem( scopeMenu, SWT.RADIO );
-        attributeTypesAndObjectClassesMenuItem.setText( Messages.getString("SearchView.TypesAndClasses") ); //$NON-NLS-1$
+        attributeTypesAndObjectClassesMenuItem.setText( Messages.getString( "SearchView.TypesAndClasses" ) ); //$NON-NLS-1$
         attributeTypesAndObjectClassesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -453,7 +453,7 @@
         } );
         // Attributes Type Only
         final MenuItem attributesTypesOnlyMenuItem = new MenuItem( scopeMenu, SWT.RADIO );
-        attributesTypesOnlyMenuItem.setText( Messages.getString("SearchView.TypesOnly") ); //$NON-NLS-1$
+        attributesTypesOnlyMenuItem.setText( Messages.getString( "SearchView.TypesOnly" ) ); //$NON-NLS-1$
         attributesTypesOnlyMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -463,7 +463,7 @@
         } );
         // Object Classes Only
         final MenuItem objectClassesMenuItem = new MenuItem( scopeMenu, SWT.RADIO );
-        objectClassesMenuItem.setText( Messages.getString("SearchView.ClassesOnly") ); //$NON-NLS-1$
+        objectClassesMenuItem.setText( Messages.getString( "SearchView.ClassesOnly" ) ); //$NON-NLS-1$
         objectClassesMenuItem.addSelectionListener( new SelectionAdapter()
         {
             public void widgetSelected( SelectionEvent e )
@@ -574,8 +574,10 @@
                     }
                     catch ( PartInitException exception )
                     {
-                        PluginUtils.logError( Messages.getString("SearchView.ErrorOpeningEditor"), exception ); //$NON-NLS-1$
-                        ViewUtils.displayErrorMessageBox( Messages.getString("SearchView.Error"), Messages.getString("SearchView.ErrorOpeningEditor") ); //$NON-NLS-1$ //$NON-NLS-2$
+                        PluginUtils.logError( Messages.getString( "SearchView.ErrorOpeningEditor" ), exception ); //$NON-NLS-1$
+                        ViewUtils
+                            .displayErrorMessageBox(
+                                Messages.getString( "SearchView.Error" ), Messages.getString( "SearchView.ErrorOpeningEditor" ) ); //$NON-NLS-1$ //$NON-NLS-2$
                     }
                 }
             }
@@ -914,7 +916,7 @@
 
         if ( searchString == null )
         {
-            sb.append( Messages.getString("SearchView.NoSearch") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "SearchView.NoSearch" ) ); //$NON-NLS-1$
         }
         else
         {
@@ -927,14 +929,14 @@
             sb.append( " " ); //$NON-NLS-1$
             if ( resultsCount > 1 )
             {
-                sb.append( Messages.getString("SearchView.Matches") ); //$NON-NLS-1$
+                sb.append( Messages.getString( "SearchView.Matches" ) ); //$NON-NLS-1$
             }
             else
             {
-                sb.append( Messages.getString("SearchView.Match") ); //$NON-NLS-1$
+                sb.append( Messages.getString( "SearchView.Match" ) ); //$NON-NLS-1$
             }
 
-            sb.append( Messages.getString("SearchView.InWorkspace") ); //$NON-NLS-1$
+            sb.append( Messages.getString( "SearchView.InWorkspace" ) ); //$NON-NLS-1$
         }
 
         searchResultsLabel.setText( sb.toString() );

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Wed Nov 26 07:36:13 2008
@@ -84,7 +84,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
@@ -96,7 +96,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_OID )
@@ -113,7 +113,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -137,7 +137,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
@@ -149,7 +149,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
             else if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_OID )
@@ -166,7 +166,7 @@
                 }
                 else
                 {
-                    label = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                    label = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                 }
             }
 
@@ -194,7 +194,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
@@ -206,7 +206,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_OID )
@@ -227,7 +227,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_ALL_ALIASES )
@@ -239,7 +239,7 @@
                     }
                     else
                     {
-                        secondaryLabel = Messages.getString("SearchViewLabelProvider.None"); //$NON-NLS-1$
+                        secondaryLabel = Messages.getString( "SearchViewLabelProvider.None" ); //$NON-NLS-1$
                     }
                 }
                 else if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_OID )

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewSortingDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewSortingDialog.java?rev=720901&r1=720900&r2=720901&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewSortingDialog.java (original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewSortingDialog.java Wed Nov 26 07:36:13 2008
@@ -73,7 +73,7 @@
     protected void configureShell( Shell newShell )
     {
         super.configureShell( newShell );
-        newShell.setText( Messages.getString("SearchViewSortingDialog.ViewSorting") ); //$NON-NLS-1$
+        newShell.setText( Messages.getString( "SearchViewSortingDialog.ViewSorting" ) ); //$NON-NLS-1$
     }
 
 
@@ -89,28 +89,28 @@
         // Grouping Group
         Group groupingGroup = new Group( composite, SWT.NONE );
         groupingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-        groupingGroup.setText( Messages.getString("SearchViewSortingDialog.Grouping") ); //$NON-NLS-1$
+        groupingGroup.setText( Messages.getString( "SearchViewSortingDialog.Grouping" ) ); //$NON-NLS-1$
         groupingGroup.setLayout( new GridLayout() );
 
         // Attribute Types first Button
         attributeTypesFirst = new Button( groupingGroup, SWT.RADIO );
-        attributeTypesFirst.setText( Messages.getString("SearchViewSortingDialog.TypesFirst") ); //$NON-NLS-1$
+        attributeTypesFirst.setText( Messages.getString( "SearchViewSortingDialog.TypesFirst" ) ); //$NON-NLS-1$
         attributeTypesFirst.setEnabled( true );
 
         // Object Classes first Button
         objectClassesFirst = new Button( groupingGroup, SWT.RADIO );
-        objectClassesFirst.setText( Messages.getString("SearchViewSortingDialog.ClassesFirst") ); //$NON-NLS-1$
+        objectClassesFirst.setText( Messages.getString( "SearchViewSortingDialog.ClassesFirst" ) ); //$NON-NLS-1$
         objectClassesFirst.setEnabled( true );
 
         // Mixed Button
         mixedButton = new Button( groupingGroup, SWT.RADIO );
-        mixedButton.setText( Messages.getString("SearchViewSortingDialog.Mixed") ); //$NON-NLS-1$
+        mixedButton.setText( Messages.getString( "SearchViewSortingDialog.Mixed" ) ); //$NON-NLS-1$
         mixedButton.setEnabled( true );
 
         // Sorting Group
         Group sortingGroup = new Group( composite, SWT.NONE );
         sortingGroup.setLayoutData( new GridData( SWT.FILL, SWT.FILL, true, true ) );
-        sortingGroup.setText( Messages.getString("SearchViewSortingDialog.Sorting") ); //$NON-NLS-1$
+        sortingGroup.setText( Messages.getString( "SearchViewSortingDialog.Sorting" ) ); //$NON-NLS-1$
         sortingGroup.setLayout( new GridLayout() );
         Composite sortingGroupComposite = new Composite( sortingGroup, SWT.NONE );
         GridLayout gl = new GridLayout( 4, false );
@@ -120,23 +120,25 @@
 
         // Sort by Label
         Label sortByLabel = new Label( sortingGroupComposite, SWT.NONE );
-        sortByLabel.setText( Messages.getString("SearchViewSortingDialog.SortBy") ); //$NON-NLS-1$
+        sortByLabel.setText( Messages.getString( "SearchViewSortingDialog.SortBy" ) ); //$NON-NLS-1$
 
         // Sorting Combo
         sortingCombo = new Combo( sortingGroupComposite, SWT.DROP_DOWN | SWT.READ_ONLY | SWT.BORDER );
         sortingCombo.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-        sortingCombo.setItems( new String[]
-            { Messages.getString("SearchViewSortingDialog.FirstName"), Messages.getString("SearchViewSortingDialog.OID") } ); //$NON-NLS-1$ //$NON-NLS-2$
+        sortingCombo
+            .setItems( new String[]
+                {
+                    Messages.getString( "SearchViewSortingDialog.FirstName" ), Messages.getString( "SearchViewSortingDialog.OID" ) } ); //$NON-NLS-1$ //$NON-NLS-2$
         sortingCombo.setEnabled( true );
 
         // Ascending Button
         ascendingButton = new Button( sortingGroupComposite, SWT.RADIO );
-        ascendingButton.setText( Messages.getString("SearchViewSortingDialog.Ascending") ); //$NON-NLS-1$
+        ascendingButton.setText( Messages.getString( "SearchViewSortingDialog.Ascending" ) ); //$NON-NLS-1$
         ascendingButton.setEnabled( true );
 
         // Descending Button
         descendingButton = new Button( sortingGroupComposite, SWT.RADIO );
-        descendingButton.setText( Messages.getString("SearchViewSortingDialog.Descending") ); //$NON-NLS-1$
+        descendingButton.setText( Messages.getString( "SearchViewSortingDialog.Descending" ) ); //$NON-NLS-1$
         descendingButton.setEnabled( true );
 
         initFieldsFromPreferences();
@@ -217,12 +219,14 @@
                     PluginConstants.PREFS_SEARCH_VIEW_GROUPING_MIXED );
             }
 
-            if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals( Messages.getString("SearchViewSortingDialog.FirstName") ) ) //$NON-NLS-1$
+            if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals(
+                Messages.getString( "SearchViewSortingDialog.FirstName" ) ) ) //$NON-NLS-1$
             {
                 store.setValue( PluginConstants.PREFS_SEARCH_VIEW_SORTING_BY,
                     PluginConstants.PREFS_SEARCH_VIEW_SORTING_BY_FIRSTNAME );
             }
-            else if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals( Messages.getString("SearchViewSortingDialog.OID") ) ) //$NON-NLS-1$
+            else if ( sortingCombo.getItem( sortingCombo.getSelectionIndex() ).equals(
+                Messages.getString( "SearchViewSortingDialog.OID" ) ) ) //$NON-NLS-1$
             {
                 store.setValue( PluginConstants.PREFS_SEARCH_VIEW_SORTING_BY,
                     PluginConstants.PREFS_SEARCH_VIEW_SORTING_BY_OID );



Mime
View raw message