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/06/25 10:39:52 UTC
svn commit: r1687442 -
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java
Author: elecharny
Date: Thu Jun 25 08:39:51 2015
New Revision: 1687442
URL: http://svn.apache.org/r1687442
Log:
Added support for the autzRegexp and authIdRewrite parameters
Modified:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java
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=1687442&r1=1687441&r2=1687442&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 Thu Jun 25 08:39:51 2015
@@ -39,10 +39,6 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
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.AuthIdRewriteDecorator;
-import org.apache.directory.studio.openldap.config.editor.wrappers.AuthIdRewriteWrapper;
-import org.apache.directory.studio.openldap.config.editor.wrappers.AuthzRegexpDecorator;
-import org.apache.directory.studio.openldap.config.editor.wrappers.AuthzRegexpWrapper;
import org.apache.directory.studio.openldap.config.editor.wrappers.DisallowFeatureDecorator;
import org.apache.directory.studio.openldap.config.editor.wrappers.RequireConditionDecorator;
import org.apache.directory.studio.openldap.config.editor.wrappers.RestrictOperationDecorator;
@@ -179,10 +175,10 @@ public class OptionsPage extends OpenLDA
// The Authz regexp and rewrite rules
/** The olcAuthIDRewrite parameter */
- private TableWidget<AuthIdRewriteWrapper> authIdRewriteTableWidget;
+ private TableWidget<StringValueWrapper> authIdRewriteTableWidget;
/** The olcAuthzRegexp parameter */
- private TableWidget<AuthzRegexpWrapper> authzRegexpTableWidget;
+ private TableWidget<StringValueWrapper> authzRegexpTableWidget;
// The miscellaneous parameters
/** The olcArgsFile parameter */
@@ -295,9 +291,9 @@ public class OptionsPage extends OpenLDA
{
List<String> authIdRewrites = new ArrayList<String>();
- for ( AuthIdRewriteWrapper authIdRewrite : authIdRewriteTableWidget.getElements() )
+ for ( StringValueWrapper authIdRewrite : authIdRewriteTableWidget.getElements() )
{
- authIdRewrites.add( authIdRewrite.toString() );
+ authIdRewrites.add( authIdRewrite.getValue() );
}
getConfiguration().getGlobal().setOlcAuthIDRewrite( authIdRewrites );
@@ -314,9 +310,9 @@ public class OptionsPage extends OpenLDA
{
List<String> authzRegexps = new ArrayList<String>();
- for ( AuthzRegexpWrapper authzRegexp : authzRegexpTableWidget.getElements() )
+ for ( StringValueWrapper authzRegexp : authzRegexpTableWidget.getElements() )
{
- authzRegexps.add( authzRegexp.toString() );
+ authzRegexps.add( authzRegexp.getValue() );
}
getConfiguration().getGlobal().setOlcAuthzRegexp( authzRegexps );
@@ -649,8 +645,8 @@ public class OptionsPage extends OpenLDA
Composite composite = createSectionComposite( toolkit, section, 2, false );
// The olcAuthIdRewrite parameter table
- authIdRewriteTableWidget = new TableWidget<AuthIdRewriteWrapper>(
- new AuthIdRewriteDecorator( composite.getShell() ) );
+ authIdRewriteTableWidget = new TableWidget<StringValueWrapper>(
+ new StringValueDecorator( composite.getShell() , "authIdRewrite") );
authIdRewriteTableWidget.createOrderedWidgetWithEdit( composite, toolkit );
authIdRewriteTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
@@ -683,8 +679,8 @@ public class OptionsPage extends OpenLDA
Composite composite = createSectionComposite( toolkit, section, 2, false );
// The olcAuthzRegexp parameter table
- authzRegexpTableWidget = new TableWidget<AuthzRegexpWrapper>(
- new AuthzRegexpDecorator( composite.getShell() ) );
+ authzRegexpTableWidget = new TableWidget<StringValueWrapper>(
+ new StringValueDecorator( composite.getShell(), "AuthzRegexp" ) );
authzRegexpTableWidget.createOrderedWidgetWithEdit( composite, toolkit );
authzRegexpTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
@@ -763,8 +759,6 @@ public class OptionsPage extends OpenLDA
othersGroup.setLayout( othersGroupGridLayout );
othersGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 2, 1 ) );
- //toolkit.createLabel( composite, "" );
-
// The olcGentleHUP Button
gentleHupCheckbox = BaseWidgetUtils.createCheckbox( othersGroup,
Messages.getString( "OpenLDAPOptionsPage.GentleHUP" ), 1 );
@@ -905,7 +899,7 @@ public class OptionsPage extends OpenLDA
if ( authIdRewrites != null )
{
int nbElements = authIdRewrites.size();
- List<AuthIdRewriteWrapper> rewrites = new ArrayList<AuthIdRewriteWrapper>( nbElements );
+ List<StringValueWrapper> rewrites = new ArrayList<StringValueWrapper>( nbElements );
int[] valuePrefixes = new int[nbElements];
Map<Integer, String> values = new HashMap<Integer, String>(nbElements);
int pos = 0;
@@ -927,7 +921,7 @@ public class OptionsPage extends OpenLDA
for ( int prefix : valuePrefixes )
{
String value = values.get( prefix );
- rewrites.add( new AuthIdRewriteWrapper( value ) );
+ rewrites.add( new StringValueWrapper( value, true ) );
}
authIdRewriteTableWidget.setElements( rewrites );
@@ -935,7 +929,7 @@ public class OptionsPage extends OpenLDA
else
{
// Store an empty list
- List<AuthIdRewriteWrapper> rewrites = new ArrayList<AuthIdRewriteWrapper>();
+ List<StringValueWrapper> rewrites = new ArrayList<StringValueWrapper>();
authIdRewriteTableWidget.setElements( rewrites );
}
@@ -949,7 +943,7 @@ public class OptionsPage extends OpenLDA
if ( authzRegexps != null )
{
int nbElements = authzRegexps.size();
- List<AuthzRegexpWrapper> regexps = new ArrayList<AuthzRegexpWrapper>( nbElements );
+ List<StringValueWrapper> regexps = new ArrayList<StringValueWrapper>( nbElements );
int[] valuePrefixes = new int[nbElements];
Map<Integer, String> values = new HashMap<Integer, String>(nbElements);
int pos = 0;
@@ -971,7 +965,7 @@ public class OptionsPage extends OpenLDA
for ( int prefix : valuePrefixes )
{
String value = values.get( prefix );
- regexps.add( new AuthzRegexpWrapper( value ) );
+ regexps.add( new StringValueWrapper( value, true ) );
}
authzRegexpTableWidget.setElements( regexps );
@@ -979,7 +973,7 @@ public class OptionsPage extends OpenLDA
else
{
// Store an empty list
- List<AuthzRegexpWrapper> regexps = new ArrayList<AuthzRegexpWrapper>();
+ List<StringValueWrapper> regexps = new ArrayList<StringValueWrapper>();
authzRegexpTableWidget.setElements( regexps );
}