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/12 17:45:04 UTC
svn commit: r1673023 - in
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases:
BerkeleyDbDatabaseSpecificDetailsBlock.java DatabasesDetailsPage.java
Author: elecharny
Date: Sun Apr 12 15:45:04 2015
New Revision: 1673023
URL: http://svn.apache.org/r1673023
Log:
Correctly update the databaseConfig lists
Modified:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesDetailsPage.java
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.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/BerkeleyDbDatabaseSpecificDetailsBlock.java?rev=1673023&r1=1673022&r2=1673023&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/BerkeleyDbDatabaseSpecificDetailsBlock.java Sun Apr 12 15:45:04 2015
@@ -85,6 +85,7 @@ public class BerkeleyDbDatabaseSpecificD
{
DbConfigurationDialog dialog = new DbConfigurationDialog( editConfigurationButton.getShell(),
database.getOlcDbConfig().toArray( new String[0] ) );
+
if ( dialog.open() == DbConfigurationDialog.OK )
{
List<String> newConfiguration = new ArrayList<String>();
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=1673023&r1=1673022&r2=1673023&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 Sun Apr 12 15:45:04 2015
@@ -1399,8 +1399,11 @@ public class DatabasesDetailsPage implem
newSyncReplValue = "{" + orderingPrefix + "}" + newSyncReplValue;
}
- databaseWrapper.getDatabase().getOlcSyncrepl().remove( syncReplValue );
- databaseWrapper.getDatabase().getOlcSyncrepl().add( newSyncReplValue );
+ OlcDatabaseConfig databaseConfig = databaseWrapper.getDatabase();
+ List<String> newOlcSyncrepls = databaseConfig.getOlcSyncrepl();
+ newOlcSyncrepls.remove( syncReplValue );
+ newOlcSyncrepls.add( newSyncReplValue );
+ databaseConfig.setOlcSyncrepl( newOlcSyncrepls );
refreshReplicationConsumersTableViewer();
replicationConsumersTableViewer.setSelection( new StructuredSelection( newSyncReplValue ) );
setEditorDirty();
@@ -1434,11 +1437,19 @@ public class DatabasesDetailsPage implem
NLS.bind( "Are you sure you want to delete the ''{0}'' replication consumer ?",
getReplicationConsumerText( syncReplValue ) ) ) )
{
- if ( ( databaseWrapper != null ) && ( databaseWrapper.getDatabase() != null ) )
+
+ if ( databaseWrapper != null )
{
- databaseWrapper.getDatabase().getOlcSyncrepl().remove( syncReplValue );
- refreshReplicationConsumersTableViewer();
- setEditorDirty();
+ OlcDatabaseConfig databaseConfig = databaseWrapper.getDatabase();
+
+ if( databaseConfig != null )
+ {
+ List<String> newOlcSynrepls = databaseConfig.getOlcSyncrepl();
+ newOlcSynrepls.remove( syncReplValue );
+ databaseConfig.setOlcSyncrepl( newOlcSynrepls );
+ refreshReplicationConsumersTableViewer();
+ setEditorDirty();
+ }
}
}
}