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/22 17:51:39 UTC
svn commit: r1681156 [3/3] - in /directory/studio/trunk/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/
apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/
combine...
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=1681156&r1=1681155&r2=1681156&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 Fri May 22 15:51:37 2015
@@ -27,13 +27,14 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.common.ui.widgets.LogLevelWidget;
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.databases.DatabaseWrapper;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseWrapperLabelProvider;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseWrapperViewerSorter;
import org.apache.directory.studio.openldap.config.editor.overlays.ModuleWrapper;
import org.apache.directory.studio.openldap.config.editor.overlays.ModuleWrapperLabelProvider;
import org.apache.directory.studio.openldap.config.editor.overlays.ModuleWrapperViewerSorter;
import org.apache.directory.studio.openldap.config.editor.pages.OverlaysPage;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperLabelProvider;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperViewerSorter;
+import org.apache.directory.studio.openldap.config.editor.wrappers.ServerIdWrapper;
import org.apache.directory.studio.openldap.config.model.OlcModuleList;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.apache.directory.studio.openldap.config.model.widgets.ServerIdTableWidget;
@@ -149,16 +150,16 @@ public class OverviewPage extends OpenLD
/** This link opens the Overlays configuration tab */
private Hyperlink overlaysPageLink;
- // This link opens the Security configuration tab
+ /** This link opens the Security configuration tab */
private Hyperlink securityPageLink;
- // This link opens the Tuning configuration tab
+ /** This link opens the Tuning configuration tab */
private Hyperlink tuningPageLink;
- // This link opens the Schema configuration tab
+ /** This link opens the Schema configuration tab */
private Hyperlink schemaPageLink;
- // This link opens the Options configuration tab
+ /** This link opens the Options configuration tab */
private Hyperlink optionsPageLink;
/**
@@ -203,7 +204,7 @@ public class OverviewPage extends OpenLD
{
public void linkActivated( HyperlinkEvent e )
{
- //getServerConfigurationEditor().showPage( SecurityPage.class );
+ getServerConfigurationEditor().showPage( SecurityPage.class );
}
};
@@ -215,7 +216,7 @@ public class OverviewPage extends OpenLD
{
public void linkActivated( HyperlinkEvent e )
{
- //getServerConfigurationEditor().showPage( TuningPage.class );
+ getServerConfigurationEditor().showPage( TuningPage.class );
}
};
Added: 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=1681156&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/SecurityPage.java Fri May 22 15:51:37 2015
@@ -0,0 +1,71 @@
+/*
+ * 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.pages;
+
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+
+
+/**
+ * This class represents the Security Page of the Server Configuration Editor.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class SecurityPage extends OpenLDAPServerConfigurationEditorPage
+{
+ /** The Page ID*/
+ public static final String ID = SecurityPage.class.getName(); //$NON-NLS-1$
+
+ /** The Page Title */
+ private static final String TITLE = "Security";
+
+
+ // UI Controls
+
+ /**
+ * Creates a new instance of SecurityPage.
+ *
+ * @param editor the associated editor
+ */
+ public SecurityPage( OpenLDAPServerConfigurationEditor editor )
+ {
+ super( editor, ID, TITLE );
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void createFormContent( Composite parent, FormToolkit toolkit )
+ {
+
+ refreshUI();
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void refreshUI()
+ {
+ }
+}
Added: 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=1681156&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/TuningPage.java Fri May 22 15:51:37 2015
@@ -0,0 +1,434 @@
+/*
+ * 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.pages;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+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;
+import org.apache.directory.studio.common.ui.widgets.TableWidget;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.dialogs.TcpBufferDialog;
+import org.apache.directory.studio.openldap.config.editor.wrappers.TcpBufferWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.TcpBufferWrapperLabelProvider;
+
+
+/**
+ * This class represents the Tuning Page of the Server Configuration Editor. We
+ * manage the global tuning of the server, and more specifically, those parameters :
+ * <ul>
+ * <li>Network :
+ * <ul>
+ * <li>olcTCPBuffers</li>
+ * <li>olcSockbufMaxIncoming</li>
+ * <li>olcSockbufMaxIncomingAuth</li>
+ * </ul>
+ * </li>
+ * <li>Concurrency :
+ * <ul>
+ * <li>olcConcurrency</li>
+ * <li>olcConnMaxPending</li>
+ * <li>olcConnMaxPendingAuth</li>
+ * <li>olcListenerThreads</li>
+ * <li>olcThreads</li>
+ * <li>olcToolThreads</li>
+ * </ul>
+ * </li>
+ * <li>LDAP limits :
+ * <ul>
+ * <li>olcIdleTimeout</li>
+ * <li>olcSizeLimit</li>
+ * <li>olcTimeLimit</li>
+ * <li>olcWriteTimeout</li>
+ * </ul>
+ * </li>
+ * <li>Index limits :
+ * <ul>
+ * <li>olcIndexHash64</li>
+ * <li>olcIndexIntLen</li>
+ * <li>olcIndexSubstrAnyLen</li>
+ * <li>olcIndexSubstrAnyStep</li>
+ * <li>olcIndexSubstrIfMaxLen</li>
+ * <li>olcIndexSubstrIfMinLen</li>
+ * </ul>
+ * </li>
+ * </ul>
+ *
+ * <pre>
+ * </pre>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class TuningPage extends OpenLDAPServerConfigurationEditorPage
+{
+ /** The Page ID*/
+ public static final String ID = TuningPage.class.getName(); //$NON-NLS-1$
+
+ /** The Page Title */
+ private static final String TITLE = Messages.getString( "OpenLDAPTuningPage.Title" );
+
+ // UI Controls for the Network part
+ /** The olcSockbufMaxIncoming Text */
+ private Text sockbufMaxIncomingText;
+
+ /** The olcSockbufMaxIncomingAuth Text */
+ private Text sockbufMaxIncomingAuthText;
+
+ /** The olcTCPBuffer widget */
+ TableWidget<TcpBufferWrapper> tcpBufferTableWidget;
+
+ // UI Controls for the Concurrency part
+
+ /**
+ * Creates a new instance of TuningPage.
+ *
+ * @param editor the associated editor
+ */
+ public TuningPage( OpenLDAPServerConfigurationEditor editor )
+ {
+ super( editor, ID, TITLE );
+ }
+
+
+
+
+ /**
+ * The listener for the sockbufMaxIncomingText Text
+ */
+ private ModifyListener sockbufMaxIncomingTextListener = new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ Display display = sockbufMaxIncomingText.getDisplay();
+
+ try
+ {
+ int idValue = Integer.parseInt( sockbufMaxIncomingText.getText() );
+
+ // The value must be between 0 and 0x3FFFF
+ if ( ( idValue < 0 ) || ( idValue > 0x3FFFF ) )
+ {
+ System.out.println( "Wrong value : it must be a value in [0..0x3FFFF]" );
+ sockbufMaxIncomingText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ return;
+ }
+
+ sockbufMaxIncomingText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ // Not even a number
+ System.out.println( "Wrong value : it must be an integer" );
+ sockbufMaxIncomingText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ }
+ }
+ };
+
+
+ /**
+ * The listener for the sockbufMaxIncomingAuthText Text
+ */
+ private ModifyListener sockbufMaxIncomingAuthTextListener = new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ Display display = sockbufMaxIncomingAuthText.getDisplay();
+
+ try
+ {
+ int idValue = Integer.parseInt( sockbufMaxIncomingAuthText.getText() );
+
+ // The value must be between 0 and 0x3FFFFF
+ if ( ( idValue < 0 ) || ( idValue > 0x3FFFFF ) )
+ {
+ System.out.println( "Wrong value : it must be a value in [0..0x3FFFFF]" );
+ sockbufMaxIncomingAuthText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ return;
+ }
+
+ sockbufMaxIncomingAuthText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ }
+ catch ( NumberFormatException nfe )
+ {
+ // Not even a number
+ System.out.println( "Wrong value : it must be an integer" );
+ sockbufMaxIncomingAuthText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ }
+ }
+ };
+
+
+ /**
+ * Creates the OpenLDAP tuning config Tab. It contains 2 rows, with
+ * 2 columns :
+ *
+ * <pre>
+ * +-----------------------------------+---------------------------------+
+ * | | |
+ * | Network | Concurrency |
+ * | | |
+ * +-----------------------------------+---------------------------------+
+ * | | |
+ * | LDAP limits | Index limits |
+ * | | |
+ * +-----------------------------------+---------------------------------+
+ * </pre>
+ * {@inheritDoc}
+ */
+ protected void createFormContent( Composite parent, FormToolkit toolkit )
+ {
+ TableWrapLayout twl = new TableWrapLayout();
+ twl.numColumns = 2;
+ parent.setLayout( twl );
+
+ // The Network part
+ Composite networkComposite = toolkit.createComposite( parent );
+ networkComposite.setLayout( new GridLayout() );
+ TableWrapData networkCompositeTableWrapData = new TableWrapData( TableWrapData.FILL, TableWrapData.TOP, 1, 1 );
+ networkCompositeTableWrapData.grabHorizontal = true;
+ networkComposite.setLayoutData( networkCompositeTableWrapData );
+
+ // The Concurrency part
+ Composite concurrencyComposite = toolkit.createComposite( parent );
+ concurrencyComposite.setLayout( new GridLayout() );
+ TableWrapData concurrencyCompositeTableWrapData = new TableWrapData( TableWrapData.FILL, TableWrapData.TOP, 1, 1 );
+ concurrencyCompositeTableWrapData.grabHorizontal = true;
+ concurrencyComposite.setLayoutData( concurrencyCompositeTableWrapData );
+
+ // The LDAP Limits part
+ Composite ldapLimitsComposite = toolkit.createComposite( parent );
+ ldapLimitsComposite.setLayout( new GridLayout() );
+ TableWrapData ldapLimitsCompositeTableWrapData = new TableWrapData( TableWrapData.FILL, TableWrapData.TOP, 1, 1 );
+ ldapLimitsCompositeTableWrapData.grabHorizontal = true;
+ ldapLimitsComposite.setLayoutData( ldapLimitsCompositeTableWrapData );
+
+ // The Index Limits part
+ Composite indexLimitsComposite = toolkit.createComposite( parent );
+ indexLimitsComposite.setLayout( new GridLayout() );
+ TableWrapData indexLimitsCompositeTableWrapData = new TableWrapData( TableWrapData.FILL, TableWrapData.TOP, 1, 1 );
+ indexLimitsCompositeTableWrapData.grabHorizontal = true;
+ indexLimitsComposite.setLayoutData( indexLimitsCompositeTableWrapData );
+
+ // Now, create the sections
+ createNetworkSection( toolkit, networkComposite );
+ createConcurrencySection( toolkit, concurrencyComposite );
+ createLdapLimitsSection( toolkit, ldapLimitsComposite );
+ createIndexLimitsSection( toolkit, indexLimitsComposite );
+
+ //refreshUI();
+ }
+
+
+ /**
+ * Creates the Network section. We support the configuration
+ * of those parameters :
+ * <ul>
+ * <li>olcSockbufMaxIncoming</li>
+ * <li>olcSockbufMaxIncomingAuth</li>
+ * <li>olcTCPBuffer</li>
+ * </ul>
+ *
+ * <pre>
+ * .-------------------------------------.
+ * |âTCPâconfigurationâââââââââââââââââââ|
+ * +-------------------------------------+
+ * |âTCPBuffersââââââââââââââââââââââââââ|
+ * |â+-----------------------+âââââââââââ|
+ * |â|âxyzâââââââââââââââââââ|â(Add)âââââ|
+ * |â|âabcâââââââââââââââââââ|â(Edit)ââââ|
+ * |â|âââââââââââââââââââââââ|â(Delete)ââ|
+ * |â+-----------------------+âââââââââââ|
+ * |âââââââââââââââââââââââââââââââââââââ|
+ * |âMaxâIncomingâBufferââââââ:â[ââââââ]â|
+ * |âMaxâIncomingâBufferâAuthâ:â[ââââââ]â|
+ * +-------------------------------------+
+ * </pre>
+ *
+ *
+ * @param toolkit the toolkit
+ * @param parent the parent composite
+ */
+ private void createNetworkSection( FormToolkit toolkit, Composite parent )
+ {
+ // Creation of the section
+ Section section = createSection( toolkit, parent, Messages.getString( "OpenLDAPTuningPage.NetworkSection" ) );
+
+ // The content
+ Composite networkSectionComposite = toolkit.createComposite( section );
+ toolkit.paintBordersFor( networkSectionComposite );
+ GridLayout gridLayout = new GridLayout( 2, false );
+ gridLayout.marginHeight = gridLayout.marginWidth = 0;
+ networkSectionComposite.setLayout( gridLayout );
+ section.setClient( networkSectionComposite );
+
+ // The TCPBuffers Label
+ Label serverIdLabel = toolkit.createLabel( networkSectionComposite, Messages.getString( "OpenLDAPTuningPage.TCPBuffers" ) ); //$NON-NLS-1$
+ serverIdLabel.setLayoutData( new GridData( SWT.FILL, SWT.FILL, false, false, 2, 1 ) );
+
+ // The TCPBuffers widget
+ tcpBufferTableWidget = new TableWidget<TcpBufferWrapper>();
+ tcpBufferTableWidget.setLabelProvider( new TcpBufferWrapperLabelProvider() );
+ tcpBufferTableWidget.setElementDialog( new TcpBufferDialog( null ) );
+
+ tcpBufferTableWidget.createWidget( networkSectionComposite, toolkit );
+ tcpBufferTableWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 4, 1 ) );
+
+ // The olcSockbufMaxIncoming parameter.
+ Label sockbufMaxIncomingLabel = toolkit.createLabel( networkSectionComposite,
+ Messages.getString( "OpenLDAPTuningPage.SockbufMaxIncoming" ) ); //$NON-NLS-1$
+ sockbufMaxIncomingText = toolkit.createText( networkSectionComposite, "" );
+ sockbufMaxIncomingText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ // From 0 to 262 143 (0x3FFFF)
+ sockbufMaxIncomingText.setTextLimit( 6 );
+ // Attach a listener to check the value
+ sockbufMaxIncomingText.addModifyListener( sockbufMaxIncomingTextListener );
+
+ // The olcSockbufMaxIncomingAuth parameter.
+ Label sockbufMaxIncomingAuthLabel = toolkit.createLabel( networkSectionComposite,
+ Messages.getString( "OpenLDAPTuningPage.SockbufMaxIncomingAuth" ) ); //$NON-NLS-1$
+ sockbufMaxIncomingAuthText = toolkit.createText( networkSectionComposite, "" );
+ sockbufMaxIncomingAuthText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ // From 0 to 4 193 303 (0x3FFFFF)
+ sockbufMaxIncomingAuthText.setTextLimit( 7 );
+ // Attach a listener to check the value
+ sockbufMaxIncomingAuthText.addModifyListener( sockbufMaxIncomingAuthTextListener );
+
+ //sockbufMaxIncomingText = createConfigDirText
+ //serverIdWidget.createWidget( networkSectionComposite );
+ //serverIdWidget.getControl().setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false, 4, 1 ) );
+ }
+
+
+ private void createConcurrencySection( FormToolkit toolkit, Composite parent )
+ {
+ // Creation of the section
+ Section section = createSection( toolkit, parent, Messages.getString( "OpenLDAPTuningPage.ConcurrencySection" ) );
+ }
+
+
+ private void createLdapLimitsSection( FormToolkit toolkit, Composite parent )
+ {
+ // Creation of the section
+ Section section = createSection( toolkit, parent, Messages.getString( "OpenLDAPTuningPage.LdapLimitsSection" ) );
+ }
+
+
+ private void createIndexLimitsSection( FormToolkit toolkit, Composite parent )
+ {
+ // Creation of the section
+ Section section = createSection( toolkit, parent, Messages.getString( "OpenLDAPTuningPage.IndexLimitsSection" ) );
+ }
+
+
+ /**
+ * Construct a list of TcpBufferWrapper list from teh String we get from the LDAP server.
+ * We have to parse this :
+ * <pre>
+ * [listener=<URL>] [{read|write}=]<size>
+ * </pre>
+ * @param tcpBufferList
+ * @return
+ */
+ private List<TcpBufferWrapper> createTcpBufferList( List<String> tcpBufferList )
+ {
+ List<TcpBufferWrapper> tcpBufferWrapperList = new ArrayList<TcpBufferWrapper>();
+
+ for ( String tcpBuffer : tcpBufferList )
+ {
+ if ( tcpBuffer != null )
+ {
+ TcpBufferWrapper tcpBufferWrapper = new TcpBufferWrapper( tcpBuffer );
+
+ tcpBufferWrapperList.add( tcpBufferWrapper );
+ }
+ }
+
+ return tcpBufferWrapperList;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void refreshUI()
+ {
+ removeListeners();
+
+ // TCPBuffer Text
+ List<String> list = new ArrayList<String>();
+ list.add( "Listener=http://www.apache.org write=65535" );
+ List<TcpBufferWrapper> tcpBufferList = createTcpBufferList( list ); //;getConfiguration().getGlobal().getOlcTCPBuffer() );
+ tcpBufferTableWidget.setElements( tcpBufferList );
+
+ // Socket Buffer Max Incoming Text
+ String sockbufMaxIncomingString = getConfiguration().getGlobal().getOlcSockbufMaxIncoming();
+
+ if ( sockbufMaxIncomingString != null )
+ {
+ sockbufMaxIncomingText.setText( sockbufMaxIncomingString );
+ }
+
+ // Socket Buffer Max Incoming Text
+ String sockbufMaxIncomingAuthString = getConfiguration().getGlobal().getOlcSockbufMaxIncomingAuth();
+
+ if ( sockbufMaxIncomingAuthString != null )
+ {
+ sockbufMaxIncomingAuthText.setText( sockbufMaxIncomingAuthString );
+ }
+
+ addListeners();
+ }
+
+
+ /**
+ * Adds the listeners.
+ */
+ private void addListeners()
+ {
+ tcpBufferTableWidget.addWidgetModifyListener( dirtyWidgetModifyListener );
+
+ sockbufMaxIncomingText.addModifyListener( dirtyModifyListener );
+ sockbufMaxIncomingAuthText.addModifyListener( dirtyModifyListener );
+ }
+
+
+ /**
+ * Removes the listeners
+ */
+ private void removeListeners()
+ {
+ tcpBufferTableWidget.removeWidgetModifyListener( dirtyWidgetModifyListener );
+
+ sockbufMaxIncomingText.removeModifyListener( dirtyModifyListener );
+ sockbufMaxIncomingAuthText.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=1681156&r1=1681155&r2=1681156&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 Fri May 22 15:51:37 2015
@@ -32,6 +32,7 @@ ServerConfigurationEditorUtils.ChangesCo
ServerConfigurationEditorUtils.Question=Question
ServerConfigurationEditorUtils.TheFileAlreadyExistsWantToReplace=The file "{0}" already exists. Do you want to replace the existing file?
+# The overview page
OpenLDAPOverviewPage.Title=Overview
OpenLDAPOverviewPage.GlobalSection=Global parameters
OpenLDAPOverviewPage.ServerID=Server ID :
@@ -49,4 +50,14 @@ OpenLDAPOverviewPage.TuningPageLink=Tuni
OpenLDAPOverviewPage.SchemaPageLink=Schema Configuration...
OpenLDAPOverviewPage.OptionsPageLink=Options Configuration...
+# The Network page
+OpenLDAPTuningPage.Title=Network
+OpenLDAPTuningPage.NetworkSection=Network parameters
+OpenLDAPTuningPage.ConcurrencySection=Concurrency parameters
+OpenLDAPTuningPage.LdapLimitsSection=LDAP Limits parameters
+OpenLDAPTuningPage.IndexLimitsSection=Index Limits parameters
+OpenLDAPTuningPage.SockbufMaxIncoming=Socket Buffer Max Incoming :
+OpenLDAPTuningPage.SockbufMaxIncomingAuth=Socket Buffer Max Incoming Auth :
+OpenLDAPTuningPage.TCPBuffers=TCPBuffers
+
OptionsPage.LogTitle=Logs
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapper.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.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/DatabaseWrapper.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapper.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapper.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapper.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.databases;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.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/DatabaseWrapperLabelProvider.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.databases;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
import java.util.List;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.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/DatabaseWrapperViewerSorter.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperViewerSorter.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.databases;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapper.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapper.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/ServerIdWrapper.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapper.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapper.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapper.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapper.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.pages;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
/**
* A wrapper for a ServerID which can be either an integer between 0 and 4095
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperLabelProvider.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperLabelProvider.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/ServerIdWrapperLabelProvider.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperLabelProvider.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperLabelProvider.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperLabelProvider.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperLabelProvider.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.pages;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.graphics.Image;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperViewerSorter.java (from r1680606, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperViewerSorter.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/ServerIdWrapperViewerSorter.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperViewerSorter.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperViewerSorter.java&r1=1680606&r2=1681156&rev=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ServerIdWrapperViewerSorter.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/ServerIdWrapperViewerSorter.java Fri May 22 15:51:37 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.pages;
+package org.apache.directory.studio.openldap.config.editor.wrappers;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.jface.viewers.ViewerSorter;
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapper.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/TcpBufferWrapper.java?rev=1681156&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapper.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapper.java Fri May 22 15:51:37 2015
@@ -0,0 +1,279 @@
+/*
+ * 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 java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * This class wraps the TCPBuffer parameter :
+ * <pre>
+ * [listener=<URL>] [{read|write}=]<size>
+ * </pre>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class TcpBufferWrapper
+{
+ /** The two kind of TCP buffer we can configure */
+ public enum TcpType
+ {
+ READ( "read" ),
+ WRITE( "write" ),
+ BOTH( "" );
+
+ private String value;
+
+ private TcpType( String value )
+ {
+ this.value = value;
+ }
+
+ private String getValue()
+ {
+ return value;
+ }
+ }
+
+ /** The TCP listener (optional) */
+ private URL listener;
+
+ /** The type of TCP buffer (either read or write, or both ) (optional) */
+ private TcpType tcpType;
+
+ /** The TCP Buffer size (between 0 and 65535) */
+ private int size;
+
+
+ /**
+ * Create a TcpBufferWrapper instance
+ *
+ * @param size The TcpBuffer size
+ * @param tcpType read or write, but can be null for both
+ * @param url The listener
+ */
+ public TcpBufferWrapper( int size, TcpType tcpType, String url )
+ {
+ this.size = size;
+ this.tcpType = tcpType;
+ try
+ {
+ listener = new URL( url );
+ }
+ catch ( MalformedURLException e )
+ {
+ e.printStackTrace();
+ }
+ }
+
+
+ /**
+ * Create a TcpBufferWrapper instance from a String
+ *
+ * @param tcpBufferStr The String that contain the value
+ */
+ public TcpBufferWrapper( String tcpBufferStr )
+ {
+ if ( tcpBufferStr != null )
+ {
+ // use a lowercase version of the string
+ String lowerCaseTcpBuffer = tcpBufferStr.toLowerCase();
+ int pos = 0;
+
+ if ( lowerCaseTcpBuffer.startsWith( "listener=" ) )
+ {
+ // Fine, we have an URL, it's before the first space
+ int spacePos = lowerCaseTcpBuffer.indexOf( ' ' );
+
+ if ( spacePos == -1 )
+ {
+ // This is wrong...
+ }
+ else
+ {
+ String urlStr = tcpBufferStr.substring( 9, spacePos );
+
+ try
+ {
+ this.setListener( new URL( urlStr ) );
+ }
+ catch ( MalformedURLException e )
+ {
+ e.printStackTrace();
+ }
+
+ // Get rid of the following spaces
+ pos = spacePos;
+
+ while ( pos < lowerCaseTcpBuffer.length() )
+ {
+ if ( lowerCaseTcpBuffer.charAt( pos ) != ' ' )
+ {
+ break;
+ }
+
+ pos++;
+ }
+ }
+
+ // We might have a 'read' or 'write' prefix
+ if ( lowerCaseTcpBuffer.startsWith( "read=", pos ) )
+ {
+ tcpType = TcpType.READ;
+ pos += 5;
+ }
+ else if ( lowerCaseTcpBuffer.startsWith( "write=", pos ) )
+ {
+ tcpType = TcpType.WRITE;
+ pos += 6;
+ }
+
+ // get the integer
+ String sizeStr = lowerCaseTcpBuffer.substring( pos );
+
+ size = Integer.valueOf( sizeStr );
+
+ if ( ( size < 0 ) ||( size > 65535 ) )
+ {
+ // This is wrong
+ }
+ }
+ }
+ }
+
+ /**
+ * @return the listener
+ */
+ public URL getListener()
+ {
+ return listener;
+ }
+
+
+ /**
+ * @param listener the listener to set
+ */
+ public void setListener( URL listener )
+ {
+ this.listener = listener;
+ }
+
+
+ /**
+ * @return the tcpType
+ */
+ public TcpType getTcpType()
+ {
+ return tcpType;
+ }
+
+
+ /**
+ * @param tcpType the tcpType to set
+ */
+ public void setTcpType( TcpType tcpType )
+ {
+ this.tcpType = tcpType;
+ }
+
+
+ /**
+ * @return the size
+ */
+ public int getSize()
+ {
+ return size;
+ }
+
+
+ /**
+ * @param size the size to set
+ */
+ public void setSize( int size )
+ {
+ this.size = size;
+ }
+
+
+ /**
+ * Tells if the TcpBuffer element is valid or not
+ * @param sizeStr the TCP buffer size
+ * @param urlStr The listener as a String
+ * @return true if the value are correct, false otherwise
+ */
+ public static boolean isValid( String sizeStr, String urlStr )
+ {
+ // the size must be positive and below 2^32-1
+ if ( ( sizeStr != null) && ( sizeStr.length() > 0 ) )
+ {
+ try
+ {
+ int size = Integer.valueOf( sizeStr );
+
+ if ( ( size < 0 ) || ( size > 65535 ) )
+ {
+ return false;
+ }
+ }
+ catch ( NumberFormatException nfe )
+ {
+ return false;
+ }
+ }
+
+ // Check the URL
+ if ( ( urlStr != null ) && ( urlStr.length() > 0 ) )
+ {
+ try
+ {
+ new URL( urlStr );
+ }
+ catch ( MalformedURLException mue )
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+
+ /**
+ * @see Object#toString()
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ if ( listener != null )
+ {
+ sb.append( "listener=" ).append( listener ).append( " ");
+ }
+
+ if ( ( tcpType != null ) && ( tcpType != TcpType.BOTH ) )
+ {
+ sb.append( tcpType.getValue() ).append( "=" );
+ }
+
+ sb.append( size );
+
+ return sb.toString();
+ }
+}
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapperLabelProvider.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/TcpBufferWrapperLabelProvider.java?rev=1681156&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapperLabelProvider.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/TcpBufferWrapperLabelProvider.java Fri May 22 15:51:37 2015
@@ -0,0 +1,56 @@
+/*
+ * 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.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This class defines a label provider for a TCPBuffer wrapper viewer.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class TcpBufferWrapperLabelProvider extends LabelProvider
+{
+ /**
+ * Construct the label for a TCPBuffer. It can be one of :
+ *
+ */
+ public String getText( Object element )
+ {
+ if ( element instanceof TcpBufferWrapper )
+ {
+ String tcpBufferText = ( ( TcpBufferWrapper ) element ).toString();
+
+ return tcpBufferText;
+ }
+
+ return super.getText( element );
+ };
+
+
+ /**
+ * Get the image. We have none (may be we could add one for URLs ?)
+ */
+ public Image getImage( Object element )
+ {
+ return null;
+ };
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/IndicesWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/IndicesWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/IndicesWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/IndicesWidget.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -46,7 +46,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Table;
import org.eclipse.ui.forms.widgets.FormToolkit;
-
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
import org.apache.directory.studio.openldap.config.editor.dialogs.IndexDialog;
@@ -58,7 +57,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class IndicesWidget extends BrowserWidget
+public class IndicesWidget extends AbstractWidget
{
/** The indices list */
private List<String> indices = new ArrayList<String>();
@@ -326,7 +325,7 @@ public class IndicesWidget extends Brows
String selectedIndex = ( String ) selection.getFirstElement();
// Open the index dialog, with the selected index
- IndexDialog dialog = new IndexDialog( addButton.getShell(), new OlcDbIndex( selectedIndex ),
+ IndexDialog dialog = new IndexDialog( editButton.getShell(), new OlcDbIndex( selectedIndex ),
browserConnection );
if ( dialog.open() == IndexDialog.OK )
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/LockDetectWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/LockDetectWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/LockDetectWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/LockDetectWidget.java Fri May 22 15:51:37 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.widgets;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -38,7 +38,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LockDetectWidget extends BrowserWidget
+public class LockDetectWidget extends AbstractWidget
{
/** The combo viewer's values */
private Object[] comboViewerValues = new Object[]
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/ServerIdTableWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/ServerIdTableWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/ServerIdTableWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/widgets/ServerIdTableWidget.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.DoubleClickEvent;
import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -48,7 +48,7 @@ import org.eclipse.ui.forms.widgets.Form
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
import org.apache.directory.studio.openldap.config.editor.dialogs.ServerIdDialog;
-import org.apache.directory.studio.openldap.config.editor.pages.ServerIdWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.ServerIdWrapper;
/**
@@ -64,7 +64,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ServerIdTableWidget extends BrowserWidget
+public class ServerIdTableWidget extends AbstractWidget
{
/** The ServerId list */
private List<ServerIdWrapper> serverIds = new ArrayList<ServerIdWrapper>();