directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1686686 - in /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor: pages/ wrappers/
Date Sun, 21 Jun 2015 05:30:07 GMT
Author: elecharny
Date: Sun Jun 21 05:30:06 2015
New Revision: 1686686

URL: http://svn.apache.org/r1686686
Log:
o Added the olcAllows support in Options
o Removed a useless call to refreshUI in the Overview page
o Renamed the SsDecorator class to SsfDecorator
o Added plaecholder wrappers for the AuthIdRewrite and AuthzRegexp parameters
o 

Added:
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AllowFeatureDecorator.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthIdRewriteWrapper.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthzRegexpWrapper.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsfDecorator.java
      - copied, changed from r1686615, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsDecorator.java
Removed:
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsDecorator.java
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/OverviewPage.java
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.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
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_de.properties
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_fr.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=1686686&r1=1686685&r2=1686686&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
Sun Jun 21 05:30:06 2015
@@ -20,24 +20,65 @@
 package org.apache.directory.studio.openldap.config.editor.pages;
 
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.directory.studio.common.ui.widgets.TableWidget;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
+import org.apache.directory.studio.openldap.common.ui.model.AllowFeatureEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DisallowFeatureEnum;
+import org.apache.directory.studio.openldap.common.ui.model.RequireConditionEnum;
+import org.apache.directory.studio.openldap.common.ui.model.RestrictOperationEnum;
 import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.wrappers.AllowFeatureDecorator;
+import org.apache.directory.studio.openldap.config.editor.wrappers.AuthIdRewriteWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.AuthzRegexpWrapper;
 import org.apache.directory.studio.openldap.config.model.OlcGlobal;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 
 /**
- * This class represents the Options Page of the Server Configuration Editor. Here is the

- * content of this page :
+ * This class represents the Options Page of the Server Configuration Editor. We manage the

+ * following parameters :
+ * <ul>
+ *   <li>Operations and features :
+ *     <ul>
+ *       <li>olcAllows</li>
+ *       <li>olcDisallows</li>
+ *       <li>olcRequires</li>
+ *       <li>olcRestrict</li>
+ *     </ul>
+ *   </li>
+ *   <li>Authorization regexp & rewrite rules :
+ *     <ul>
+ *       <li>olcAuthIDRewrite</li>
+ *       <li>olcAuthzRegexp</li>
+ *     </ul>
+ *   </li>
+ *   <li>Miscellaneous options :
+ *     <ul>
+ *       <li>olcArgsFile</li>
+ *       <li>olcPluginLogFile</li>
+ *       <li>olcReferral</li>
+ *       <li>olcAuthzPolicy</li>
+ *       <li>olcRootDSE</li>
+ *       <li>olcReadOnly</li>
+ *       <li>olcGentleHUP</li>
+ *       <li>olcReadOnly</li>
+ *       <li>olcReverseLookup</li>
+ *     </ul>
+ *   </li>
+ * </ul>
+ * Here is the content of this page :
  * <pre>
  * .-----------------------------------------------------------------------------------.
  * | Options                                                                           |
@@ -97,12 +138,70 @@ public class OptionsPage extends OpenLDA
     private static final String TITLE = Messages.getString( "OpenLDAPOptionsPage.Title" );
 
     // UI Controls
+    // Operations and features
+    /** The olcAllows parameter */
+    private TableWidget<AllowFeatureEnum> allowFeatureTableWidget;
+
+    /** The olcDisallows parameter */
+    private TableWidget<DisallowFeatureEnum> disallowFeatureTableWidget;
+    
+    /** The olcRequires parameter */
+    private TableWidget<RequireConditionEnum> requireConditionTableWidget;
+
+    /** The olcRestrict parameter */
+    private TableWidget<RestrictOperationEnum> restrictOperationTableWidget;
+
+    // The Authz regexp and rewrite rules
+    /** The olcAuthIDRewrite parameter */
+    private TableWidget<AuthIdRewriteWrapper> authIdRewriteTableWidget;
+
+    /** The olcAuthzRegexp parameter */
+    private TableWidget<AuthzRegexpWrapper> authzRegexpTableWidget;
+
+    
+    // The miscellaneous parameters
+    /** The olcArgsFile parameter */
+    private Text argsFileText; 
+
     /** The olcPluginLogFile parameter */
     private Text pluginLogFileText; 
-    private Text authUsernamesToDnRewriteRuleText;
-    private Text proxyAuthorizationPolicyText;
-    private Text authzUsernamesToDnRegexpText;
 
+    /** The olcReferral parameter */
+    private Text referralText; 
+
+    /** The olcRootDSE parameter */
+    private Text rootDseText; 
+
+    /** The olcAuthzPolicy parameter */
+    private Combo authzPolicyCombo; 
+
+    /** The olcGentleHUP parameter */
+    private Button gentleHupCheckbox;
+
+    /** The olcReadOnly parameter */
+    private Button readOnlyCheckbox;
+
+    /** The olcReverseLookup parameter */
+    private Button reverseLookupCheckbox;
+    
+    
+    /**
+     * The olcAllowFeature listener
+     */
+    private WidgetModifyListener allowFeatureListener = new WidgetModifyListener()
+    {
+        public void widgetModified( WidgetModifyEvent e )
+        {
+            List<String> allowFeatures = new ArrayList<String>();
+            
+            for ( AllowFeatureEnum allowFeature : allowFeatureTableWidget.getElements() )
+            {
+                allowFeatures.add( allowFeature.getName() );
+            }
+            
+            getConfiguration().getGlobal().setOlcAllows( allowFeatures );
+        }
+    };
 
     /**
      * Creates a new instance of OptionsPage.
@@ -115,48 +214,55 @@ public class OptionsPage extends OpenLDA
     }
 
 
-    
     /**
      * {@inheritDoc}
+     * Creates the OpenLDAP options config Tab. It contains 3 sections :
+     * 
+     * <pre>
+     * +-----------------------------+
+     * |                             |
+     * |    Features & Operations    |
+     * |                             |
+     * +-----------------------------+
+     * |                             |
+     * |   Authz regxep  & rewrite   |
+     * |                             |
+     * +-----------------------------+
+     * |                             |
+     * |        Miscellaneous        |
+     * |                             |
+     * +-----------------------------+
      */
     protected void createFormContent( Composite parent, FormToolkit toolkit )
     {
-        TableWrapLayout twl = new TableWrapLayout();
-        twl.numColumns = 2;
-        twl.makeColumnsEqualWidth = true;
-        parent.setLayout( twl );
-
-        Composite leftComposite = toolkit.createComposite( parent );
-        leftComposite.setLayout( new GridLayout() );
-        TableWrapData leftCompositeTableWrapData = new TableWrapData( TableWrapData.FILL,
TableWrapData.TOP );
-        leftCompositeTableWrapData.grabHorizontal = true;
-        leftComposite.setLayoutData( leftCompositeTableWrapData );
-
-        Composite rightComposite = toolkit.createComposite( parent );
-        rightComposite.setLayout( new GridLayout() );
-        TableWrapData rightCompositeTableWrapData = new TableWrapData( TableWrapData.FILL,
TableWrapData.TOP );
-        rightCompositeTableWrapData.grabHorizontal = true;
-        rightComposite.setLayoutData( rightCompositeTableWrapData );
-
-        createLogsSection( toolkit, leftComposite );
-        createAuthenticationAndAuthorizationSection( toolkit, leftComposite );
-
-        refreshUI();
+        createFeaturesAndOperationsSection( toolkit, parent );
+        //createAuthzRegexpAndRewriteSection( toolkit, parent );
+        //createMiscellaneousSection( toolkit, parent );
     }
 
 
     /**
-     * Creates the Logs section.
+     * Creates the Features & Operations section.
      *
      * @param toolkit the toolkit
      * @param parent the parent composite
      */
-    private void createLogsSection( FormToolkit toolkit, Composite parent )
+    private void createFeaturesAndOperationsSection( FormToolkit toolkit, Composite parent
)
     {
-        // The Logs section, which can be expanded or compacted
-        Section section = createSection( toolkit, parent, Messages.getString( "OptionsPage.LogTitle"
) );
+        // The Features & Operations section, which can be expanded or compacted
+        Section section = createSection( toolkit, parent, Messages.getString( "OptionsPage.FeaturesAndOperationsSection"
) );
         Composite composite = createSectionComposite( toolkit, section, 2, false );
 
+        // The olcAllowFeature parameter
+        Label passwordHashLabel = toolkit.createLabel( composite, Messages.getString( "OptionsPage.AllowFeature"
) ); //$NON-NLS-1$
+        passwordHashLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false,
2, 1 ) );
+        
+        allowFeatureTableWidget = new TableWidget<AllowFeatureEnum>( new AllowFeatureDecorator(
composite.getShell() ) );
+
+        allowFeatureTableWidget.createWidgetNoEdit( composite, toolkit );
+        allowFeatureTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE,
true, false, 4, 1 ) );
+        addModifyListener( allowFeatureTableWidget, allowFeatureListener );
+
         // Plugin Log File Text
         toolkit.createLabel( composite, "Plugin Log File:" );
         pluginLogFileText = toolkit.createText( composite, "" );
@@ -175,6 +281,7 @@ public class OptionsPage extends OpenLDA
         Section section = createSection( toolkit, parent, "Authentication & Authorization"
);
         Composite composite = createSectionComposite( toolkit, section, 2, false );
 
+        /*
         // Authentication Usernames To DN Rewrite Rule Text
         toolkit.createLabel( composite, "Authentication rewrite rule to convert simple user
names to an LDAP DN:" );
         authUsernamesToDnRewriteRuleText = toolkit.createText( composite, "" );
@@ -189,6 +296,7 @@ public class OptionsPage extends OpenLDA
         toolkit.createLabel( composite, "Authorization Regexp to convert simple user names
to an LDAP DN:" );
         authzUsernamesToDnRegexpText = toolkit.createText( composite, "" );
         authzUsernamesToDnRegexpText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true,
false ) );
+        */
     }
 
     
@@ -197,6 +305,7 @@ public class OptionsPage extends OpenLDA
      */
     private void addListeners()
     {
+        addDirtyListener( allowFeatureTableWidget );
     }
 
     
@@ -205,6 +314,7 @@ public class OptionsPage extends OpenLDA
      */
     private void removeListeners()
     {
+        removeDirtyListener( allowFeatureTableWidget );
     }
     
 
@@ -213,69 +323,37 @@ public class OptionsPage extends OpenLDA
      */
     public void refreshUI()
     {
-        if ( isInitialized() )
-        {
-            removeListeners();
+        removeListeners();
 
-            // Getting the global configuration object
-            OlcGlobal global = getConfiguration().getGlobal();
+        // Getting the global configuration object
+        OlcGlobal global = getConfiguration().getGlobal();
 
-            if ( global != null )
-            {
-                //
-                // Assigning values to UI Controls
-                //
-
-                // Plugin Log File Text
-                String pluginLogFile = global.getOlcPluginLogFile();
-
-                if ( pluginLogFile != null )
-                {
-                    pluginLogFileText.setText( pluginLogFile );
-                }
-                else
-                {
-                    pluginLogFileText.setText( "" );
-                }
-
-                // Authentication Usernames To DN Rewrite Rule Text
-                List<String> authUsernamesToDnRewriteRule = global.getOlcAuthIDRewrite();
-
-                if ( authUsernamesToDnRewriteRule != null )
-                {
-                    authUsernamesToDnRewriteRuleText.setText( authUsernamesToDnRewriteRule
+ "" );
-                }
-                else
-                {
-                    authUsernamesToDnRewriteRuleText.setText( "" );
-                }
-
-                // Proxy Authorization Policy Text
-                String proxyAuthorizationPolicy = global.getOlcAuthzPolicy();
-
-                if ( proxyAuthorizationPolicy != null )
-                {
-                    proxyAuthorizationPolicyText.setText( proxyAuthorizationPolicy );
-                }
-                else
-                {
-                    proxyAuthorizationPolicyText.setText( "" );
-                }
+        if ( global != null )
+        {
+            //
+            // Assigning values to UI Controls
+            //
 
-                // Authorization Usernames To DN Regexp Text
-                List<String> authzUsernamesToDnRegexp = global.getOlcAuthzRegexp();
+            // Allow Feature Table Widget
+            List<String> allowedFeatures = global.getOlcAllows();
 
-                if ( authzUsernamesToDnRegexp != null )
-                {
-                    authzUsernamesToDnRegexpText.setText( authzUsernamesToDnRegexp + "" );
-                }
-                else
+            if ( allowedFeatures != null )
+            {
+                List<AllowFeatureEnum> alloweds = new ArrayList<AllowFeatureEnum>();
+                
+                for ( String allowedFeature : allowedFeatures )
                 {
-                    authzUsernamesToDnRegexpText.setText( "" );
+                    alloweds.add( AllowFeatureEnum.getFeature( allowedFeature ) );
                 }
-
-                addListeners();
+                
+                allowFeatureTableWidget.setElements( alloweds );
             }
+            else
+            {
+                allowFeatureTableWidget.setElements( new ArrayList<AllowFeatureEnum>()
);
+            }
+
+            addListeners();
         }
     }
 }

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverviewPage.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/OverviewPage.java?rev=1686686&r1=1686685&r2=1686686&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverviewPage.java
(original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverviewPage.java
Sun Jun 21 05:30:06 2015
@@ -406,8 +406,6 @@ public class OverviewPage extends OpenLD
         createDatabasesSection( toolkit, middleLeftComposite );
         createOverlaysSection( toolkit, middleRightComposite );
         createConfigDetailsLinksSection( toolkit, lowerComposite );
-
-        refreshUI();
     }
 
 

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.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/SecurityPage.java?rev=1686686&r1=1686685&r2=1686686&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.java
(original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.java
Sun Jun 21 05:30:06 2015
@@ -51,7 +51,7 @@ import org.apache.directory.studio.openl
 import org.apache.directory.studio.openldap.config.editor.dialogs.SaslSecPropsDialog;
 import org.apache.directory.studio.openldap.config.editor.wrappers.PasswordHashDecorator;
 import org.apache.directory.studio.openldap.config.editor.wrappers.SsfWrapper;
-import org.apache.directory.studio.openldap.config.editor.wrappers.SsDecorator;
+import org.apache.directory.studio.openldap.config.editor.wrappers.SsfDecorator;
 import org.apache.directory.studio.openldap.config.model.OlcGlobal;
 
 
@@ -112,8 +112,8 @@ import org.apache.directory.studio.openl
  *   | | TLS Verify Client  :       [=============]    | | Password Hash  :             
                 | |
  *   | +-----------------------------------------------+ | +----------------------------------+
          | |
  *   |                                                   | |                            
     | (Add)     | |
- *   |                                                   | |                            
     | (Edit)    | |
  *   |                                                   | |                            
     | (Delete)  | |
+ *   |                                                   | |                            
     |           | |
  *   |                                                   | +----------------------------------+
          | |
  *   |                                                   | Security  :                  
                 | |
  *   |                                                   | +----------------------------------+
          | |
@@ -719,8 +719,8 @@ public class SecurityPage extends OpenLD
      * | Password Hash  :                                                              |
      * | +-----------------------------------------------------------------+           |
      * | |                                                                 | (Add)     |
-     * | |                                                                 | (Edit)    |
      * | |                                                                 | (Delete)  |
+     * | |                                                                 |           |
      * | +-----------------------------------------------------------------+           |
      * | Security  :                                                                   |
      * | +-----------------------------------------------------------------+           |
@@ -779,7 +779,7 @@ public class SecurityPage extends OpenLD
         Label securityLabel = toolkit.createLabel( miscSectionComposite, Messages.getString(
"OpenLDAPSecurityPage.Security" ) ); //$NON-NLS-1$
         securityLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 4, 1
) );
         
-        securityTableWidget = new TableWidget<SsfWrapper>( new SsDecorator( miscSectionComposite.getShell()
) );
+        securityTableWidget = new TableWidget<SsfWrapper>( new SsfDecorator( miscSectionComposite.getShell()
) );
 
         securityTableWidget.createWidgetWithEdit( miscSectionComposite, toolkit );
         securityTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE,
true, false, 4, 1 ) );

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=1686686&r1=1686685&r2=1686686&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
Sun Jun 21 05:30:06 2015
@@ -817,8 +817,6 @@ public class TuningPage extends OpenLDAP
         createConcurrencySection( toolkit, concurrencyComposite );
         createLdapLimitsSection( toolkit, ldapLimitsComposite );
         createIndexLimitsSection( toolkit, indexLimitsComposite );
-
-        //refreshUI();
     }
 
     

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=1686686&r1=1686685&r2=1686686&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
Sun Jun 21 05:30:06 2015
@@ -143,7 +143,8 @@ OpenLDAPSecurityPage.EditLogLevels=Edit
 #---------------------------------------------------------------------------------------
 OpenLDAPOptionsPage.Title=Options
 
-OpenLDAPOptionsPage.LogTitle=Logs
+OptionsPage.FeaturesAndOperationsSection=Features & Operations
+
 
 #---------------------------------------------------------------------------------------
 # The Database page

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_de.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_de.properties?rev=1686686&r1=1686685&r2=1686686&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_de.properties
(original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_de.properties
Sun Jun 21 05:30:06 2015
@@ -143,7 +143,7 @@ OpenLDAPSecurityPage.EditLogLevels=Edit
 #---------------------------------------------------------------------------------------
 OpenLDAPOptionsPage.Title=Options
 
-OpenLDAPOptionsPage.LogTitle=Logs
+OptionsPage.FeaturesAndOperationsSection=Features & Operations
 
 #---------------------------------------------------------------------------------------
 # The Database page

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_fr.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_fr.properties?rev=1686686&r1=1686685&r2=1686686&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_fr.properties
(original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_fr.properties
Sun Jun 21 05:30:06 2015
@@ -143,7 +143,7 @@ OpenLDAPSecurityPage.EditLogLevels=Editi
 #---------------------------------------------------------------------------------------
 OpenLDAPOptionsPage.Title=Options
 
-OpenLDAPOptionsPage.LogTitle=Logs
+OptionsPage.FeaturesAndOperationsSection=Fonctions & Operations
 
 #---------------------------------------------------------------------------------------
 # The Database page

Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AllowFeatureDecorator.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AllowFeatureDecorator.java?rev=1686686&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AllowFeatureDecorator.java
(added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AllowFeatureDecorator.java
Sun Jun 21 05:30:06 2015
@@ -0,0 +1,99 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.studio.openldap.config.editor.wrappers;
+
+import org.apache.directory.studio.common.ui.TableDecorator;
+import org.apache.directory.studio.openldap.common.ui.model.AllowFeatureEnum;
+import org.apache.directory.studio.openldap.config.editor.dialogs.AllowFeatureDialog;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * A decorator for the AllowFeature table.
+ *  
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class AllowFeatureDecorator extends TableDecorator<AllowFeatureEnum>
+{
+    /**
+     * Create a new instance of AllowFeatureDecorator
+     * @param parentShell The parent Shell
+     */
+    public AllowFeatureDecorator( Shell parentShell )
+    {
+        setDialog( new AllowFeatureDialog( parentShell ) );
+    }
+
+    /**
+     * Construct the label for an AllowFeature.
+     * 
+     */
+    public String getText( Object element )
+    {
+        if ( element instanceof AllowFeatureEnum )
+        {
+            String allowFeature = ( ( AllowFeatureEnum ) element ).toString();
+
+            return allowFeature;
+        }
+
+        return super.getText( element );
+    };
+
+
+    /**
+     * Get the image. We have none
+     */
+    public Image getImage( Object element )
+    {
+        return null;
+    };
+
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int compare( AllowFeatureEnum e1, AllowFeatureEnum e2 )
+    {
+        if ( e1 != null )
+        {
+            if ( e2 == null )
+            {
+                return 1;
+            }
+            else
+            {
+                return e1.getName().compareTo( e2.getName() );
+            }
+        }
+        else
+        {
+            if ( e2 == null )
+            {
+                return 0;
+            }
+            else
+            {
+                return 1;
+            }
+        }
+    }
+}

Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthIdRewriteWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthIdRewriteWrapper.java?rev=1686686&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthIdRewriteWrapper.java
(added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthIdRewriteWrapper.java
Sun Jun 21 05:30:06 2015
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.studio.openldap.config.editor.wrappers;
+
+/**
+ * A wrapper class for the values stored in the olcAuthIDRewrite attribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class AuthIdRewriteWrapper
+{
+
+}

Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthzRegexpWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthzRegexpWrapper.java?rev=1686686&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthzRegexpWrapper.java
(added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/AuthzRegexpWrapper.java
Sun Jun 21 05:30:06 2015
@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.studio.openldap.config.editor.wrappers;
+
+/**
+ * A wrapper class for the values stored in the olcAuthzRegexp attribute.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class AuthzRegexpWrapper
+{
+
+}

Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsfDecorator.java
(from r1686615, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsDecorator.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsfDecorator.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsfDecorator.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsDecorator.java&r1=1686615&r2=1686686&rev=1686686&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsDecorator.java
(original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/SsfDecorator.java
Sun Jun 21 05:30:06 2015
@@ -29,13 +29,13 @@ import org.eclipse.swt.widgets.Shell;
  *  
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SsDecorator extends TableDecorator<SsfWrapper>
+public class SsfDecorator extends TableDecorator<SsfWrapper>
 {
     /**
      * Create a new instance of SsfDecorator
      * @param parentShell The parent Shell
      */
-    public SsDecorator( Shell parentShell )
+    public SsfDecorator( Shell parentShell )
     {
         setDialog( new SsfDialog( parentShell ) );
     }



Mime
View raw message