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/04/07 20:19:37 UTC
svn commit: r1671909 - in
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor:
./ databases/
Author: elecharny
Date: Tue Apr 7 18:19:36 2015
New Revision: 1671909
URL: http://svn.apache.org/r1671909
Log:
o Added the list of existing Database in the combo used when we add a new DB
o Minor cleanup, Javadoc addition
Modified:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OptionsPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ConnectionServerConfigurationInput.java Tue Apr 7 18:19:36 2015
@@ -38,8 +38,7 @@ public class ConnectionServerConfigurati
/**
* Creates a new instance of ConnectionServerConfigurationInput.
*
- * @param connection
- * the connection
+ * @param connection the connection
*/
public ConnectionServerConfigurationInput( Connection connection )
{
@@ -99,6 +98,7 @@ public class ConnectionServerConfigurati
if ( obj instanceof ConnectionServerConfigurationInput )
{
ConnectionServerConfigurationInput input = ( ConnectionServerConfigurationInput ) obj;
+
if ( input.exists() && exists() )
{
Connection inputConnection = input.getConnection();
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/DirectoryServerConfigurationInput.java Tue Apr 7 18:19:36 2015
@@ -22,10 +22,9 @@ package org.apache.directory.studio.open
import java.io.File;
-import org.eclipse.jface.resource.ImageDescriptor;
-
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
+import org.eclipse.jface.resource.ImageDescriptor;
/**
@@ -123,6 +122,7 @@ public class DirectoryServerConfiguratio
if ( obj instanceof DirectoryServerConfigurationInput )
{
DirectoryServerConfigurationInput input = ( DirectoryServerConfigurationInput ) obj;
+
if ( input.exists() && exists() )
{
File inputDirectory = input.getDirectory();
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/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/OptionsPage.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OptionsPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OptionsPage.java Tue Apr 7 18:19:36 2015
@@ -22,6 +22,7 @@ package org.apache.directory.studio.open
import java.util.List;
+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;
@@ -32,11 +33,9 @@ import org.eclipse.ui.forms.widgets.Sect
import org.eclipse.ui.forms.widgets.TableWrapData;
import org.eclipse.ui.forms.widgets.TableWrapLayout;
-import org.apache.directory.studio.openldap.config.model.OlcGlobal;
-
/**
- * This class represents the Otptions Page of the Server Configuration Editor.
+ * This class represents the Options Page of the Server Configuration Editor.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -86,10 +85,9 @@ public class OptionsPage extends ServerC
/**
- * Creates a new instance of GeneralPage.
+ * Creates a new instance of OptionsPage.
*
- * @param editor
- * the associated editor
+ * @param editor the associated editor
*/
public OptionsPage( ServerConfigurationEditor editor )
{
@@ -498,7 +496,7 @@ public class OptionsPage extends ServerC
}
else
{
- maxPduSizeAnonymousSessionsText.setText( "");
+ maxPduSizeAnonymousSessionsText.setText( "" );
}
// Max PDU Size Authenticated Sessions Text
@@ -510,7 +508,7 @@ public class OptionsPage extends ServerC
}
else
{
- maxPduSizeAuthenticatedSessionsText.setText( "");
+ maxPduSizeAuthenticatedSessionsText.setText( "" );
}
// TCP Buffer Size Text
@@ -522,7 +520,7 @@ public class OptionsPage extends ServerC
}
else
{
- tcpBufferSizeText.setText( "");
+ tcpBufferSizeText.setText( "" );
}
// Max Pending Requests Anonymous Session Text
@@ -534,7 +532,7 @@ public class OptionsPage extends ServerC
}
else
{
- maxPendingRequestsAnonymousSessionText.setText( "");
+ maxPendingRequestsAnonymousSessionText.setText( "" );
}
// Max Pending Requests Authenticated Session Text
@@ -546,7 +544,7 @@ public class OptionsPage extends ServerC
}
else
{
- maxPendingRequestsAuthenticatedSessionText.setText( "");
+ maxPendingRequestsAuthenticatedSessionText.setText( "" );
}
// Number Seconds Closing Idle Connection Text
@@ -558,7 +556,7 @@ public class OptionsPage extends ServerC
}
else
{
- numberSecondsClosingIdleConnectionText.setText( "");
+ numberSecondsClosingIdleConnectionText.setText( "" );
}
// Number Seconds Closing Connection With Outstanding Write Text
@@ -571,7 +569,7 @@ public class OptionsPage extends ServerC
}
else
{
- numberSecondsClosingConnectionWithOutstandingWriteText.setText( "");
+ numberSecondsClosingConnectionWithOutstandingWriteText.setText( "" );
}
// Level Of Concurrency Text
@@ -584,7 +582,7 @@ public class OptionsPage extends ServerC
else
{
- levelOfConcurrencyText.setText( "");
+ levelOfConcurrencyText.setText( "" );
}
// Maximum Number Of Threads
@@ -595,7 +593,7 @@ public class OptionsPage extends ServerC
}
else
{
- maximumNumberOfThreadsText.setText( "");
+ maximumNumberOfThreadsText.setText( "" );
}
// Maximum Number Of Threads In Tool Mode Text
@@ -607,7 +605,7 @@ public class OptionsPage extends ServerC
}
else
{
- maximumNumberOfThreadsInToolModeText.setText( "");
+ maximumNumberOfThreadsInToolModeText.setText( "" );
}
// Authentication Auxprop Plugins Text
@@ -619,7 +617,7 @@ public class OptionsPage extends ServerC
}
else
{
- authenticationAuxpropPluginsText.setText( "");
+ authenticationAuxpropPluginsText.setText( "" );
}
// SASL Host Text
@@ -631,7 +629,7 @@ public class OptionsPage extends ServerC
}
else
{
- saslHostText.setText( "");
+ saslHostText.setText( "" );
}
// SASL Realm Text
@@ -643,7 +641,7 @@ public class OptionsPage extends ServerC
}
else
{
- saslRealmText.setText( "");
+ saslRealmText.setText( "" );
}
// SASL Security Properties Text
@@ -655,7 +653,7 @@ public class OptionsPage extends ServerC
}
else
{
- saslSecurityPropertiesText.setText( "");
+ saslSecurityPropertiesText.setText( "" );
}
// Certificate Authorities File Text
@@ -667,7 +665,7 @@ public class OptionsPage extends ServerC
}
else
{
- certificateAuthoritiesFileText.setText( "");
+ certificateAuthoritiesFileText.setText( "" );
}
// Certificate Authorities Path Text
@@ -679,7 +677,7 @@ public class OptionsPage extends ServerC
}
else
{
- certificateAuthoritiesPathText.setText( "");
+ certificateAuthoritiesPathText.setText( "" );
}
// Server Certificate File Text
@@ -691,7 +689,7 @@ public class OptionsPage extends ServerC
}
else
{
- serverCertificateFileText.setText( "");
+ serverCertificateFileText.setText( "" );
}
// Server Private Key File Text
@@ -703,7 +701,7 @@ public class OptionsPage extends ServerC
}
else
{
- serverPrivateKeyFileText.setText( "");
+ serverPrivateKeyFileText.setText( "" );
}
// Cipher Suite Text
@@ -715,7 +713,7 @@ public class OptionsPage extends ServerC
}
else
{
- cipherSuiteText.setText( "");
+ cipherSuiteText.setText( "" );
}
// Certificate Revocation List File Text
@@ -739,7 +737,7 @@ public class OptionsPage extends ServerC
}
else
{
- certificateRevocationListLevelText.setText( "");
+ certificateRevocationListLevelText.setText( "" );
}
// Diffie-Hellman Parameters File Text
@@ -751,7 +749,7 @@ public class OptionsPage extends ServerC
}
else
{
- diffieHellmanParametersFileText.setText( "");
+ diffieHellmanParametersFileText.setText( "" );
}
// Random Bits File Text
@@ -763,7 +761,7 @@ public class OptionsPage extends ServerC
}
else
{
- randomBitsFileText.setText( "");
+ randomBitsFileText.setText( "" );
}
// Incoming Certificates Verification Level Text
@@ -775,7 +773,7 @@ public class OptionsPage extends ServerC
}
else
{
- incomingCertificatesVerificationLevelText.setText( "");
+ incomingCertificatesVerificationLevelText.setText( "" );
}
// Key Length for Ordered Integer Indices Text
@@ -787,7 +785,7 @@ public class OptionsPage extends ServerC
}
else
{
- keyLengthForOrderedIntegerIndicesText.setText( "");
+ keyLengthForOrderedIntegerIndicesText.setText( "" );
}
// Maximum Length For Subinitial And Subfinal Indices Text
@@ -800,7 +798,7 @@ public class OptionsPage extends ServerC
}
else
{
- maximumLengthForSubinitialAndSubfinalIndicesText.setText( "");
+ maximumLengthForSubinitialAndSubfinalIndicesText.setText( "" );
}
// Minimum Length For Subinitial And Subfinal Indices Text
@@ -813,7 +811,7 @@ public class OptionsPage extends ServerC
}
else
{
- minimumLengthForSubinitialAndSubfinalIndicesText.setText( "");
+ minimumLengthForSubinitialAndSubfinalIndicesText.setText( "" );
}
// Length Used For Subany Indices Text
@@ -824,7 +822,7 @@ public class OptionsPage extends ServerC
}
else
{
- lengthUsedForSubanyIndicesText.setText( "");
+ lengthUsedForSubanyIndicesText.setText( "" );
}
// Steps Used In Subany Index Lookups Text
@@ -836,7 +834,7 @@ public class OptionsPage extends ServerC
}
else
{
- stepsUsedInSubanyIndexLookupsText.setText( "");
+ stepsUsedInSubanyIndexLookupsText.setText( "" );
}
// Authentication Usernames To DN Rewrite Rule Text
@@ -848,7 +846,7 @@ public class OptionsPage extends ServerC
}
else
{
- authUsernamesToDnRewriteRuleText.setText( "");
+ authUsernamesToDnRewriteRuleText.setText( "" );
}
// Proxy Authorization Policy Text
@@ -860,7 +858,7 @@ public class OptionsPage extends ServerC
}
else
{
- proxyAuthorizationPolicyText.setText( "");
+ proxyAuthorizationPolicyText.setText( "" );
}
// Authorization Usernames To DN Regexp Text
@@ -872,7 +870,7 @@ public class OptionsPage extends ServerC
}
else
{
- authzUsernamesToDnRegexpText.setText( "");
+ authzUsernamesToDnRegexpText.setText( "" );
}
}
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java Tue Apr 7 18:19:36 2015
@@ -26,6 +26,10 @@ import java.util.Enumeration;
import org.apache.directory.studio.common.core.jobs.StudioJob;
import org.apache.directory.studio.common.core.jobs.StudioRunnableWithProgress;
import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabasesPage;
+import org.apache.directory.studio.openldap.config.jobs.LoadConfigurationRunnable;
+import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
+import org.apache.directory.studio.openldap.config.model.io.SaveConfigurationRunnable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.IPageChangedListener;
import org.eclipse.jface.dialogs.PageChangedEvent;
@@ -38,11 +42,6 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.forms.editor.FormEditor;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabasesPage;
-import org.apache.directory.studio.openldap.config.jobs.LoadConfigurationRunnable;
-import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
-import org.apache.directory.studio.openldap.config.model.io.SaveConfigurationRunnable;
-
/**
* This class implements the Server Configuration Editor.
@@ -131,9 +130,11 @@ public class ServerConfigurationEditor e
private void showOrHideTabFolder()
{
Composite container = getContainer();
+
if ( container instanceof CTabFolder )
{
CTabFolder folder = ( CTabFolder ) container;
+
if ( getPageCount() == 1 )
{
folder.setTabHeight( 0 );
@@ -142,6 +143,7 @@ public class ServerConfigurationEditor e
{
folder.setTabHeight( -1 );
}
+
folder.layout( true, true );
}
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java Tue Apr 7 18:19:36 2015
@@ -20,6 +20,9 @@
package org.apache.directory.studio.openldap.config.editor;
+import org.apache.directory.studio.openldap.config.actions.EditorExportConfigurationAction;
+import org.apache.directory.studio.openldap.config.actions.EditorImportConfigurationAction;
+import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.osgi.util.NLS;
@@ -44,10 +47,6 @@ import org.eclipse.ui.forms.editor.FormP
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
-import org.apache.directory.studio.openldap.config.actions.EditorExportConfigurationAction;
-import org.apache.directory.studio.openldap.config.actions.EditorImportConfigurationAction;
-import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
-
/**
* This class represents the General Page of the Server Configuration Editor.
@@ -58,7 +57,7 @@ public abstract class ServerConfiguratio
{
protected static final Color GRAY_COLOR = new Color( null, 120, 120, 120 );
protected static final String TABULATION = " ";
-
+
/** A flag to indicate if the page is initialized */
protected boolean isInitialized = false;
@@ -82,8 +81,7 @@ public abstract class ServerConfiguratio
/**
* Creates a new instance of GeneralPage.
*
- * @param editor
- * the associated editor
+ * @param editor the associated editor
*/
public ServerConfigurationEditorPage( ServerConfigurationEditor editor, String id, String title )
{
@@ -94,8 +92,7 @@ public abstract class ServerConfiguratio
/**
* Gets the ServerConfigurationEditor object associated with the page.
*
- * @return
- * the ServerConfigurationEditor object associated with the page
+ * @return the ServerConfigurationEditor object associated with the page
*/
public ServerConfigurationEditor getServerConfigurationEditor()
{
@@ -115,8 +112,7 @@ public abstract class ServerConfiguratio
/**
* Gets the configuration associated with the editor.
*
- * @return
- * the configuration associated with the editor
+ * @return the configuration associated with the editor
*/
public OpenLdapConfiguration getConfiguration()
{
@@ -156,7 +152,7 @@ public abstract class ServerConfiguratio
toolbarManager.update( true );
createFormContent( parent, toolkit );
-
+
isInitialized = true;
}
@@ -164,10 +160,8 @@ public abstract class ServerConfiguratio
/**
* Subclasses must implement this method to create the content of their form.
*
- * @param parent
- * the parent element
- * @param toolkit
- * the form toolkit
+ * @param parent the parent element
+ * @param toolkit the form toolkit
*/
protected abstract void createFormContent( Composite parent, FormToolkit toolkit );
@@ -176,7 +170,8 @@ public abstract class ServerConfiguratio
* Refreshes the UI.
*/
protected abstract void refreshUI();
-
+
+
/**
* Indicates if the page is initialized.
*
@@ -192,12 +187,9 @@ public abstract class ServerConfiguratio
/**
* Creates a Text that can be used to enter a port number.
*
- * @param toolkit
- * the toolkit
- * @param parent
- * the parent
- * @return
- * a Text that can be used to enter a port number
+ * @param toolkit the toolkit
+ * @param parent the parent
+ * @return a Text that can be used to enter a port number
*/
protected Text createPortText( FormToolkit toolkit, Composite parent )
{
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationInput.java Tue Apr 7 18:19:36 2015
@@ -20,9 +20,8 @@
package org.apache.directory.studio.openldap.config.editor;
-import org.eclipse.ui.IEditorInput;
-
import org.apache.directory.studio.openldap.config.jobs.EntryBasedConfigurationPartition;
+import org.eclipse.ui.IEditorInput;
/**
@@ -35,8 +34,7 @@ public interface ServerConfigurationInpu
/**
* Gets the original configuration partition.
*
- * @return
- * the original configuration partition
+ * @return the original configuration partition
*/
public EntryBasedConfigurationPartition getOriginalPartition();
@@ -44,8 +42,7 @@ public interface ServerConfigurationInpu
/**
* Sets the original configuration partition.
*
- * @param originalPartition
- * the original configuration
+ * @param originalPartition the original configuration
*/
public void setOriginalPartition( EntryBasedConfigurationPartition originalPartition );
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java Tue Apr 7 18:19:36 2015
@@ -30,6 +30,26 @@ import org.apache.directory.studio.ldapb
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
+import org.apache.directory.studio.openldap.common.ui.widgets.BooleanWithDefaultWidget;
+import org.apache.directory.studio.openldap.common.ui.widgets.EntryWidget;
+import org.apache.directory.studio.openldap.common.ui.widgets.PasswordWidget;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
+import org.apache.directory.studio.openldap.config.editor.dialogs.OverlayDialog;
+import org.apache.directory.studio.openldap.config.editor.dialogs.ReplicationConsumerDialog;
+import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcBdbConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcHdbConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcLdifConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcMdbConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcNullConfig;
+import org.apache.directory.studio.openldap.config.model.database.OlcRelayConfig;
+import org.apache.directory.studio.openldap.syncrepl.Provider;
+import org.apache.directory.studio.openldap.syncrepl.SyncRepl;
+import org.apache.directory.studio.openldap.syncrepl.SyncReplParser;
+import org.apache.directory.studio.openldap.syncrepl.SyncReplParserException;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.fieldassist.ControlDecoration;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -63,26 +83,6 @@ import org.eclipse.ui.forms.IFormPart;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.apache.directory.studio.openldap.common.ui.widgets.BooleanWithDefaultWidget;
-import org.apache.directory.studio.openldap.common.ui.widgets.EntryWidget;
-import org.apache.directory.studio.openldap.common.ui.widgets.PasswordWidget;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
-import org.apache.directory.studio.openldap.config.editor.dialogs.OverlayDialog;
-import org.apache.directory.studio.openldap.config.editor.dialogs.ReplicationConsumerDialog;
-import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcBdbConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcHdbConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcLdifConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcMdbConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcNullConfig;
-import org.apache.directory.studio.openldap.config.model.database.OlcRelayConfig;
-import org.apache.directory.studio.openldap.syncrepl.Provider;
-import org.apache.directory.studio.openldap.syncrepl.SyncRepl;
-import org.apache.directory.studio.openldap.syncrepl.SyncReplParser;
-import org.apache.directory.studio.openldap.syncrepl.SyncReplParserException;
/**
@@ -96,12 +96,23 @@ public class DatabasesDetailsPage implem
private static DatabaseTypeEnum[] EDITABLE_DATABASE_TYPES = new DatabaseTypeEnum[]
{
DatabaseTypeEnum.NONE,
+ DatabaseTypeEnum.FRONTEND,
+ DatabaseTypeEnum.CONFIG,
DatabaseTypeEnum.BDB,
+ DatabaseTypeEnum.DB_PERL,
+ DatabaseTypeEnum.DB_SOCKET,
DatabaseTypeEnum.HDB,
- DatabaseTypeEnum.LDIF,
DatabaseTypeEnum.MDB,
+ DatabaseTypeEnum.LDAP,
+ DatabaseTypeEnum.LDIF,
+ DatabaseTypeEnum.META,
+ DatabaseTypeEnum.MONITOR,
+ DatabaseTypeEnum.NDB,
DatabaseTypeEnum.NULL,
- DatabaseTypeEnum.RELAY
+ DatabaseTypeEnum.PASSWD,
+ DatabaseTypeEnum.RELAY,
+ DatabaseTypeEnum.SHELL,
+ DatabaseTypeEnum.SQL
};
/** The frontend database type array */
@@ -227,12 +238,12 @@ public class DatabasesDetailsPage implem
}
};
-
private ISelectionChangedListener databaseTypeComboViewerSelectionChangedListener = new ISelectionChangedListener()
{
public void selectionChanged( SelectionChangedEvent event )
{
- DatabaseTypeEnum type = ( DatabaseTypeEnum ) ( ( StructuredSelection ) databaseTypeComboViewer.getSelection() )
+ DatabaseTypeEnum type = ( DatabaseTypeEnum ) ( ( StructuredSelection ) databaseTypeComboViewer
+ .getSelection() )
.getFirstElement();
if ( ( databaseWrapper != null ) && ( databaseWrapper.getDatabase() != null ) )
@@ -376,19 +387,19 @@ public class DatabasesDetailsPage implem
databaseTypeComboViewer = new ComboViewer( databaseTypeCombo );
databaseTypeComboViewer.setContentProvider( new ArrayContentProvider() );
databaseTypeComboViewer.setLabelProvider( new LabelProvider()
+ {
+ public String getText( Object element )
{
- public String getText( Object element )
+ if ( element instanceof DatabaseTypeEnum )
{
- if ( element instanceof DatabaseTypeEnum )
- {
- DatabaseTypeEnum databaseType = ( DatabaseTypeEnum ) element;
-
- return databaseType.getName();
- }
+ DatabaseTypeEnum databaseType = ( DatabaseTypeEnum ) element;
- return super.getText( element );
+ return databaseType.getName();
}
- } );
+
+ return super.getText( element );
+ }
+ } );
// Suffix
toolkit.createLabel( composite, "Suffix:" );
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesMasterDetailsBlock.java Tue Apr 7 18:19:36 2015
@@ -26,6 +26,11 @@ import java.util.List;
import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
+import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -53,11 +58,6 @@ import org.eclipse.ui.forms.MasterDetail
import org.eclipse.ui.forms.SectionPart;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.Section;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
-import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
/**
@@ -82,10 +82,19 @@ public class DatabasesMasterDetailsBlock
private Object currentSelection;
// UI Fields
+ /** The table listing all the existing databases */
private TableViewer viewer;
+
+ /** The button used to add a new Database */
private Button addButton;
+
+ /** The button used to delete an existing Database */
private Button deleteButton;
+
+ /** The button used to move up Database in the list */
private Button upButton;
+
+ /** The button used to move down Database in the list */
private Button downButton;
// Listeners
@@ -230,7 +239,7 @@ public class DatabasesMasterDetailsBlock
private void initFromInput()
{
databaseWrappers.clear();
-
+
for ( OlcDatabaseConfig database : page.getConfiguration().getDatabases() )
{
databaseWrappers.add( new DatabaseWrapper( database ) );
@@ -272,6 +281,7 @@ public class DatabasesMasterDetailsBlock
OlcDatabaseConfig database = new OlcDatabaseConfig();
database.setOlcDatabase( "{" + getNewOrderingValue() + "}" + newId );
+
try
{
database.addOlcSuffix( new Dn( "dc=" + newId + ",dc=com" ) ); //$NON-NLS-1$ //$NON-NLS-2$
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java?rev=1671909&r1=1671908&r2=1671909&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java Tue Apr 7 18:19:36 2015
@@ -20,16 +20,15 @@
package org.apache.directory.studio.openldap.config.editor.databases;
+import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorPage;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorPage;
-
/**
- * This class represents the General Page of the Server Configuration Editor.
+ * This class represents the Databases Page of the Server Configuration Editor.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@@ -46,10 +45,9 @@ public class DatabasesPage extends Serve
/**
- * Creates a new instance of GeneralPage.
+ * Creates a new instance of DatabasePage.
*
- * @param editor
- * the associated editor
+ * @param editor the associated editor
*/
public DatabasesPage( ServerConfigurationEditor editor )
{