You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/26 17:16:45 UTC

svn commit: r1681774 - in /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages: OptionsPage.java TuningPage.java messages.properties

Author: elecharny
Date: Tue May 26 15:16:45 2015
New Revision: 1681774

URL: http://svn.apache.org/r1681774
Log:
Moved the Index configuration parameters from the Options page to the Tuning page

Modified:
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java?rev=1681774&r1=1681773&r2=1681774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java Tue May 26 15:16:45 2015
@@ -69,11 +69,6 @@ public class OptionsPage extends OpenLDA
     private Text diffieHellmanParametersFileText;
     private Text randomBitsFileText;
     private Text incomingCertificatesVerificationLevelText;
-    private Text keyLengthForOrderedIntegerIndicesText;
-    private Text maximumLengthForSubinitialAndSubfinalIndicesText;
-    private Text minimumLengthForSubinitialAndSubfinalIndicesText;
-    private Text lengthUsedForSubanyIndicesText;
-    private Text stepsUsedInSubanyIndexLookupsText;
     private Text authUsernamesToDnRewriteRuleText;
     private Text proxyAuthorizationPolicyText;
     private Text authzUsernamesToDnRegexpText;
@@ -116,7 +111,6 @@ public class OptionsPage extends OpenLDA
         createLogsSection( toolkit, leftComposite );
         createAuthenticationAndAuthorizationSection( toolkit, leftComposite );
         createConnectionLimitsSection( toolkit, leftComposite );
-        createIndicesSection( toolkit, leftComposite );
         createSaslSection( toolkit, rightComposite );
         createTlsSection( toolkit, rightComposite );
 
@@ -264,46 +258,6 @@ public class OptionsPage extends OpenLDA
 
 
     /**
-     * Creates the Indices section.
-     *
-     * @param toolkit the toolkit
-     * @param parent the parent composite
-     */
-    private void createIndicesSection( FormToolkit toolkit, Composite parent )
-    {
-        Section section = createSection( toolkit, parent, "Indices" );
-        Composite composite = createSectionComposite( toolkit, section, 2, false );
-
-        // Key Length for Ordered Integer Indices Text
-        toolkit.createLabel( composite, "Key length for ordered integer indices:" );
-        keyLengthForOrderedIntegerIndicesText = toolkit.createText( composite, "" );
-        keyLengthForOrderedIntegerIndicesText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
-        // Maximum Length For Subinitial And Subfinal Indices Text
-        toolkit.createLabel( composite, "Maximum length for subinitial and subfinal indices:" );
-        maximumLengthForSubinitialAndSubfinalIndicesText = toolkit.createText( composite, "" );
-        maximumLengthForSubinitialAndSubfinalIndicesText
-            .setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
-        // Minimum Length For Subinitial And Subfinal Indices Text
-        toolkit.createLabel( composite, "Minimum length for subinitial and subfinal indices:" );
-        minimumLengthForSubinitialAndSubfinalIndicesText = toolkit.createText( composite, "" );
-        minimumLengthForSubinitialAndSubfinalIndicesText
-            .setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
-        // Length Used For Subany Indices Text
-        toolkit.createLabel( composite, "Length used for subany indices:" );
-        lengthUsedForSubanyIndicesText = toolkit.createText( composite, "" );
-        lengthUsedForSubanyIndicesText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-
-        // Steps Used In Subany Index Lookups Text
-        toolkit.createLabel( composite, "Steps used in subany index lookups:" );
-        stepsUsedInSubanyIndexLookupsText = toolkit.createText( composite, "" );
-        stepsUsedInSubanyIndexLookupsText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
-    }
-
-
-    /**
      * Creates the Authentication & Authorization section.
      *
      * @param toolkit the toolkit
@@ -611,67 +565,6 @@ public class OptionsPage extends OpenLDA
                     incomingCertificatesVerificationLevelText.setText( "" );
                 }
 
-                // Key Length for Ordered Integer Indices Text
-                Integer keyLengthForOrderedIntegerIndices = global.getOlcIndexIntLen();
-
-                if ( keyLengthForOrderedIntegerIndices != null )
-                {
-                    keyLengthForOrderedIntegerIndicesText.setText( keyLengthForOrderedIntegerIndices + "" );
-                }
-                else
-                {
-                    keyLengthForOrderedIntegerIndicesText.setText( "" );
-                }
-
-                // Maximum Length For Subinitial And Subfinal Indices Text
-                Integer maximumLengthForSubinitialAndSubfinalIndices = global.getOlcIndexSubstrIfMaxLen();
-
-                if ( maximumLengthForSubinitialAndSubfinalIndices != null )
-                {
-                    maximumLengthForSubinitialAndSubfinalIndicesText
-                        .setText( maximumLengthForSubinitialAndSubfinalIndices + "" );
-                }
-                else
-                {
-                    maximumLengthForSubinitialAndSubfinalIndicesText.setText( "" );
-                }
-
-                // Minimum Length For Subinitial And Subfinal Indices Text
-                Integer minimumLengthForSubinitialAndSubfinalIndices = global.getOlcIndexSubstrIfMinLen();
-
-                if ( minimumLengthForSubinitialAndSubfinalIndices != null )
-                {
-                    minimumLengthForSubinitialAndSubfinalIndicesText
-                        .setText( minimumLengthForSubinitialAndSubfinalIndices + "" );
-                }
-                else
-                {
-                    minimumLengthForSubinitialAndSubfinalIndicesText.setText( "" );
-                }
-
-                // Length Used For Subany Indices Text
-                Integer lengthUsedForSubanyIndices = global.getOlcIndexSubstrAnyLen();
-                if ( lengthUsedForSubanyIndices != null )
-                {
-                    lengthUsedForSubanyIndicesText.setText( lengthUsedForSubanyIndices + "" );
-                }
-                else
-                {
-                    lengthUsedForSubanyIndicesText.setText( "" );
-                }
-
-                // Steps Used In Subany Index Lookups Text
-                Integer stepsUsedInSubanyIndexLookups = global.getOlcIndexSubstrAnyStep();
-
-                if ( stepsUsedInSubanyIndexLookups != null )
-                {
-                    stepsUsedInSubanyIndexLookupsText.setText( stepsUsedInSubanyIndexLookups + "" );
-                }
-                else
-                {
-                    stepsUsedInSubanyIndexLookupsText.setText( "" );
-                }
-
                 // Authentication Usernames To DN Rewrite Rule Text
                 List<String> authUsernamesToDnRewriteRule = global.getOlcAuthIDRewrite();
 

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java?rev=1681774&r1=1681773&r2=1681774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java Tue May 26 15:16:45 2015
@@ -74,7 +74,6 @@ import org.apache.directory.studio.openl
  *   </li>
  *   <li>Index limits :
  *     <ul>
- *       <li>olcIndexHash64</li>
  *       <li>olcIndexIntLen</li>
  *       <li>olcIndexSubstrAnyLen</li>
  *       <li>olcIndexSubstrAnyStep</li>
@@ -85,6 +84,26 @@ import org.apache.directory.studio.openl
  * </ul>
  * 
  * <pre>
+ *   +---------------------------------------------------------------------------------+
+ *   | Tuning                                                                          |
+ *   +---------------------------------------------------------------------------------+
+ *   | .-------------------------------------. .-------------------------------------. |
+ *   | | TCP configuration                   | | Concurrency                         | |
+ *   | +-------------------------------------+ +-------------------------------------+ |
+ *   | | TCPBuffers                          | |                                     | |
+ *   | | +-----------------------+           | | Concurrency              : [      ] | |
+ *   | | | xyz                   | (Add)     | | Max Pending Conn         : [      ] | |
+ *   | | | abc                   | (Edit)    | | Max Pending Conn Auth    : [      ] | |
+ *   | | |                       | (Delete)  | | Nb Threads               : [      ] | |
+ *   | | +-----------------------+           | | Nb Threads Tool Mode     : [      ] | |
+ *   | |                                     | | Nb Listener threads      : [      ] | |
+ *   | | Max Incoming Buffer      : [      ] | |                                     | |
+ *   | | Max Incoming Buffer Auth : [      ] | |                                     | |
+ *   | +-------------------------------------+ +-------------------------------------+ |
+ *   | .-------------------------------------. .-------------------------------------. |
+ *   | | LDAP Limits                         | | Index Limits                        | |
+ *   | +-------------------------------------+ +-------------------------------------+ |
+ *   | 
  * </pre>
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -125,6 +144,23 @@ public class TuningPage extends OpenLDAP
     
     /** The olcToolThreads Text */
     private Text toolThreadsText;
+    
+    // UI Controls for the Index Limits
+    /** The olcIndexIntLenText Text */
+    private Text indexIntLenText;
+
+    /** The olcIndexSubstrAnyLen Text */
+    private Text indexSubstrAnyLenText;
+
+    /** The olcIndexSubstrAnyStep Text */
+    private Text indexSubstrAnyStepText;
+
+    /** The olcIndexSubstrIfMaxLen Text */
+    private Text indexSubstrIfMaxLenText;
+
+    /** The olcIndexSubstrIfMinLen Text */
+    private Text indexSubstrIfMinLenText;
+
 
     /**
      * Creates a new instance of TuningPage.
@@ -401,8 +437,173 @@ public class TuningPage extends OpenLDAP
             }
         }
     };
+    
+    
+    /**
+     * The listener for the IndexIntLenText Text
+     */
+    private ModifyListener indexIntLenTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            Display display = indexIntLenText.getDisplay();
 
+            try
+            {
+                int indexIntLenValue = Integer.parseInt( indexIntLenText.getText() );
 
+                // The value must be >= 0
+                if ( indexIntLenValue < 0 )
+                {
+                    System.out.println( "Wrong value : it must be a positive number" );
+                    indexIntLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                    return;
+                }
+                
+                indexIntLenText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                // Not even a number
+                System.out.println( "Wrong value : it must be an integer" );
+                indexIntLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+            }
+        }
+    };
+    
+    
+    /**
+     * The listener for the IndexSubstrAnyLenText Text
+     */
+    private ModifyListener indexSubstrAnyLenTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            Display display = indexSubstrAnyLenText.getDisplay();
+
+            try
+            {
+                int indexSubstrAnyLenValue = Integer.parseInt( indexSubstrAnyLenText.getText() );
+
+                // The value must be >= 0
+                if ( indexSubstrAnyLenValue < 0 )
+                {
+                    System.out.println( "Wrong value : it must be a positive number" );
+                    indexSubstrAnyLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                    return;
+                }
+                
+                indexSubstrAnyLenText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                // Not even a number
+                System.out.println( "Wrong value : it must be an integer" );
+                indexSubstrAnyLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+            }
+        }
+    };
+    
+    
+    /**
+     * The listener for the IndexSubstrAnyStepText Text
+     */
+    private ModifyListener indexSubstrAnyStepTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            Display display = indexSubstrAnyStepText.getDisplay();
+
+            try
+            {
+                int indexSubstrAnyStepValue = Integer.parseInt( indexSubstrAnyStepText.getText() );
+
+                // The value must be >= 0
+                if ( indexSubstrAnyStepValue < 0 )
+                {
+                    System.out.println( "Wrong value : it must be a positive number" );
+                    indexSubstrAnyStepText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                    return;
+                }
+                
+                indexSubstrAnyStepText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                // Not even a number
+                System.out.println( "Wrong value : it must be an integer" );
+                indexSubstrAnyStepText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+            }
+        }
+    };
+    
+    
+    /**
+     * The listener for the IndexSubstrIfMaxLenText Text
+     */
+    private ModifyListener indexSubstrIfMaxLenTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            Display display = indexSubstrIfMaxLenText.getDisplay();
+
+            try
+            {
+                int indexSubstrIfMaxLenValue = Integer.parseInt( indexSubstrIfMaxLenText.getText() );
+
+                // The value must be >= 0
+                if ( indexSubstrIfMaxLenValue < 0 )
+                {
+                    System.out.println( "Wrong value : it must be a positive number" );
+                    indexSubstrIfMaxLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                    return;
+                }
+                
+                indexSubstrIfMaxLenText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                // Not even a number
+                System.out.println( "Wrong value : it must be an integer" );
+                indexSubstrIfMaxLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+            }
+        }
+    };
+    
+    
+    /**
+     * The listener for the IndexSubstrIfMinLenText Text
+     */
+    private ModifyListener indexSubstrIfMinLenTextListener = new ModifyListener()
+    {
+        public void modifyText( ModifyEvent e )
+        {
+            Display display = indexSubstrIfMinLenText.getDisplay();
+
+            try
+            {
+                int indexSubstrIfMinLenValue = Integer.parseInt( indexSubstrIfMinLenText.getText() );
+
+                // The value must be >= 0
+                if ( indexSubstrIfMinLenValue < 0 )
+                {
+                    System.out.println( "Wrong value : it must be a positive number" );
+                    indexSubstrIfMinLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+                    return;
+                }
+                
+                indexSubstrIfMinLenText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+            }
+            catch ( NumberFormatException nfe )
+            {
+                // Not even a number
+                System.out.println( "Wrong value : it must be an integer" );
+                indexSubstrIfMinLenText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+            }
+        }
+    };
+
+    
     /**
      * Creates the OpenLDAP tuning config Tab. It contains 2 rows, with
      * 2 columns :
@@ -648,6 +849,59 @@ public class TuningPage extends OpenLDAP
     {
         // Creation of the section
         Section section = createSection( toolkit, parent, Messages.getString( "OpenLDAPTuningPage.IndexLimitsSection" ) );
+
+        // The content
+        Composite indexLimitSectionComposite = toolkit.createComposite( section );
+        toolkit.paintBordersFor( indexLimitSectionComposite );
+        GridLayout gridLayout = new GridLayout( 2, false );
+        gridLayout.marginHeight = gridLayout.marginWidth = 0;
+        indexLimitSectionComposite.setLayout( gridLayout );
+        section.setClient( indexLimitSectionComposite );
+
+        // The olcIndexIntLen parameter.
+        toolkit.createLabel( indexLimitSectionComposite, 
+            Messages.getString( "OpenLDAPTuningPage.IndexIntLen" ) ); //$NON-NLS-1$
+        indexIntLenText = toolkit.createText( indexLimitSectionComposite, "" );
+        indexIntLenText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        indexIntLenText.setTextLimit( 5 );
+        // Attach a listener to check the value
+        indexIntLenText.addModifyListener( indexIntLenTextListener );
+
+        // The olcIndexSubstrAnyLen parameter.
+        toolkit.createLabel( indexLimitSectionComposite, 
+            Messages.getString( "OpenLDAPTuningPage.IndexSubstrAnyLen" ) ); //$NON-NLS-1$
+        indexSubstrAnyLenText = toolkit.createText( indexLimitSectionComposite, "" );
+        indexSubstrAnyLenText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        indexSubstrAnyLenText.setTextLimit( 5 );
+        // Attach a listener to check the value
+        indexSubstrAnyLenText.addModifyListener( indexSubstrAnyLenTextListener );
+
+        // The olcIndexIntLen parameter.
+        toolkit.createLabel( indexLimitSectionComposite, 
+            Messages.getString( "OpenLDAPTuningPage.IndexSubstrAnyStep" ) ); //$NON-NLS-1$
+        indexSubstrAnyStepText = toolkit.createText( indexLimitSectionComposite, "" );
+        indexSubstrAnyStepText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        indexSubstrAnyStepText.setTextLimit( 5 );
+        // Attach a listener to check the value
+        indexSubstrAnyStepText.addModifyListener( indexSubstrAnyStepTextListener );
+
+        // The olcIndexSubstrIfMaxLen parameter.
+        toolkit.createLabel( indexLimitSectionComposite, 
+            Messages.getString( "OpenLDAPTuningPage.IndexSubstrIfMaxLen" ) ); //$NON-NLS-1$
+        indexSubstrIfMaxLenText = toolkit.createText( indexLimitSectionComposite, "" );
+        indexSubstrIfMaxLenText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        indexSubstrIfMaxLenText.setTextLimit( 5 );
+        // Attach a listener to check the value
+        indexSubstrIfMaxLenText.addModifyListener( indexSubstrIfMaxLenTextListener );
+
+        // The olcIndexSubstrIfMinLen parameter.
+        toolkit.createLabel( indexLimitSectionComposite, 
+            Messages.getString( "OpenLDAPTuningPage.IndexSubstrIfMinLen" ) ); //$NON-NLS-1$
+        indexSubstrIfMinLenText = toolkit.createText( indexLimitSectionComposite, "" );
+        indexSubstrIfMinLenText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+        indexSubstrIfMinLenText.setTextLimit( 5 );
+        // Attach a listener to check the value
+        indexSubstrIfMinLenText.addModifyListener( indexSubstrIfMinLenTextListener );
     }
     
     
@@ -754,6 +1008,46 @@ public class TuningPage extends OpenLDAP
             toolThreadsText.setText( toolThreadsString.toString() );
         }
 
+        // IndexIntLen Text
+        Integer indexIntLenString = getConfiguration().getGlobal().getOlcIndexIntLen();
+        
+        if ( indexIntLenString != null )
+        {
+            indexIntLenText.setText( indexIntLenString.toString() );
+        }
+
+        // IndexSubstrAnyLen Text
+        Integer indexSubstrAnyLenString = getConfiguration().getGlobal().getOlcIndexSubstrAnyLen();
+        
+        if ( indexSubstrAnyLenString != null )
+        {
+            indexSubstrAnyLenText.setText( indexSubstrAnyLenString.toString() );
+        }
+
+        // IndexSubstrAnyStep Text
+        Integer indexSubstrAnyStepString = getConfiguration().getGlobal().getOlcIndexSubstrAnyStep();
+        
+        if ( indexSubstrAnyStepString != null )
+        {
+            indexSubstrAnyStepText.setText( indexSubstrAnyStepString.toString() );
+        }
+
+        // IndexSubstrIfMaxLen Text
+        Integer indexSubstrIfMaxLenString = getConfiguration().getGlobal().getOlcIndexSubstrIfMaxLen();
+        
+        if ( indexSubstrIfMaxLenString != null )
+        {
+            indexSubstrIfMaxLenText.setText( indexSubstrIfMaxLenString.toString() );
+        }
+
+        // IndexSubstrIfMinLen Text
+        Integer indexSubstrIfMinLenString = getConfiguration().getGlobal().getOlcIndexSubstrIfMinLen();
+        
+        if ( indexSubstrIfMinLenString != null )
+        {
+            indexSubstrIfMinLenText.setText( indexSubstrIfMinLenString.toString() );
+        }
+
         addListeners();
     }
 
@@ -773,6 +1067,11 @@ public class TuningPage extends OpenLDAP
         listenerThreadsText.addModifyListener( dirtyModifyListener );
         threadsText.addModifyListener( dirtyModifyListener );
         toolThreadsText.addModifyListener( dirtyModifyListener );
+        indexIntLenText.addModifyListener( dirtyModifyListener );
+        indexSubstrAnyLenText.addModifyListener( dirtyModifyListener );
+        indexSubstrAnyStepText.addModifyListener( dirtyModifyListener );
+        indexSubstrIfMaxLenText.addModifyListener( dirtyModifyListener );
+        indexSubstrIfMinLenText.addModifyListener( dirtyModifyListener );
     }
 
 
@@ -791,5 +1090,10 @@ public class TuningPage extends OpenLDAP
         listenerThreadsText.removeModifyListener( dirtyModifyListener );
         threadsText.removeModifyListener( dirtyModifyListener );
         toolThreadsText.removeModifyListener( dirtyModifyListener );
+        indexIntLenText.removeModifyListener( dirtyModifyListener );
+        indexSubstrAnyLenText.removeModifyListener( dirtyModifyListener );
+        indexSubstrAnyStepText.removeModifyListener( dirtyModifyListener );
+        indexSubstrIfMaxLenText.removeModifyListener( dirtyModifyListener );
+        indexSubstrIfMinLenText.removeModifyListener( dirtyModifyListener );
     }
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties?rev=1681774&r1=1681773&r2=1681774&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties Tue May 26 15:16:45 2015
@@ -32,38 +32,62 @@ ServerConfigurationEditorUtils.ChangesCo
 ServerConfigurationEditorUtils.Question=Question
 ServerConfigurationEditorUtils.TheFileAlreadyExistsWantToReplace=The file "{0}" already exists. Do you want to replace the existing file?
 
-# The overview page
+# The Overview page
 OpenLDAPOverviewPage.Title=Overview
+
+# The Overview page sections
 OpenLDAPOverviewPage.GlobalSection=Global parameters
+OpenLDAPOverviewPage.DatabasesSection=Databases
+OpenLDAPOverviewPage.OverlaysSection=Loaded Overlays
+OpenLDAPOverviewPage.ConfigDetailsSection=Configuration Details
+
+# The Overview Global parameters
 OpenLDAPOverviewPage.ServerID=Server ID :
 OpenLDAPOverviewPage.ConfigDir=Config. Directory :
 OpenLDAPOverviewPage.PidFile=PID File :
 OpenLDAPOverviewPage.LogFile=Log File :
 OpenLDAPOverviewPage.LogLevel=Log Level :
-OpenLDAPOverviewPage.DatabasesSection=Databases
+
+# The Overview Databases table
 OpenLDAPOverviewPage.DatabasesPageLink=Advanced Databases Configuration...
-OpenLDAPOverviewPage.OverlaysSection=Loaded Overlays
+
+# The Overview Overlays table
 OpenLDAPOverviewPage.OverlaysPageLink=Advanced Overlays Configuration...
-OpenLDAPOverviewPage.ConfigDetailsSection=Configuration Details
+
+# The Overview Links to other pages
 OpenLDAPOverviewPage.SecurityPageLink=Security Configuration...
 OpenLDAPOverviewPage.TuningPageLink=Tuning Configuration...
 OpenLDAPOverviewPage.SchemaPageLink=Schema Configuration...
 OpenLDAPOverviewPage.OptionsPageLink=Options Configuration...
 
+
 # The Tuning page
 OpenLDAPTuningPage.Title=Tuning
+
+# The Tuning page sections
 OpenLDAPTuningPage.NetworkSection=Network parameters
 OpenLDAPTuningPage.ConcurrencySection=Concurrency parameters
 OpenLDAPTuningPage.LdapLimitsSection=LDAP Limits parameters
 OpenLDAPTuningPage.IndexLimitsSection=Index Limits parameters
+
+# The Tuning page Network parameters
 OpenLDAPTuningPage.SockbufMaxIncoming=Socket Buffer Max Incoming :
 OpenLDAPTuningPage.SockbufMaxIncomingAuth=Socket Buffer Max Incoming Auth :
-OpenLDAPTuningPage.TCPBuffers=TCPBuffers
-OpenLDAPTuningPage.Concurrency=Concurrency
-OpenLDAPTuningPage.ConnMaxPending=Max Pending Connections
-OpenLDAPTuningPage.ConnMaxPendingAuth=Max Pending Connections (auth)
-OpenLDAPTuningPage.ListenerThreads=Nb Listener Threads
-OpenLDAPTuningPage.Threads=Nb Threads
-OpenLDAPTuningPage.ToolThreads=Nb Threads in Tool mode
+OpenLDAPTuningPage.TCPBuffers=TCPBuffers:
+
+# The Tuning page Concurrency parameters
+OpenLDAPTuningPage.Concurrency=Concurrency Level:
+OpenLDAPTuningPage.ConnMaxPending=Max Pending Connections:
+OpenLDAPTuningPage.ConnMaxPendingAuth=Max Pending Connections (auth):
+OpenLDAPTuningPage.ListenerThreads=Nb Listener Threads:
+OpenLDAPTuningPage.Threads=Nb Threads:
+OpenLDAPTuningPage.ToolThreads=Nb Threads in Tool mode:
+
+# The Tuning page Index Limits parameters
+OpenLDAPTuningPage.IndexIntLen=Integer Indices Length:
+OpenLDAPTuningPage.IndexSubstrAnyLen=subany Indices Length:
+OpenLDAPTuningPage.IndexSubstrAnyStep=subany Indices Step:
+OpenLDAPTuningPage.IndexSubstrIfMaxLen=sub(initial/final) Indices Max length:
+OpenLDAPTuningPage.IndexSubstrIfMinLen=sub(initial/final) Indices Min length:
 
 OptionsPage.LogTitle=Logs