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/11/06 10:00:57 UTC
svn commit: r1712922 - in /directory/studio/trunk/plugins:
openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/
openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/
openlda...
Author: elecharny
Date: Fri Nov 6 09:00:57 2015
New Revision: 1712922
URL: http://svn.apache.org/viewvc?rev=1712922&view=rev
Log:
o Moved the DatabaseTypeEnum from the config editor package to the common ui package
o Removed the combo that allows the user to select the databaseType in the detail page (it will be replaced by a combo selected when the Add Database button is pressed)
Added:
directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DatabaseTypeEnum.java
- copied, changed from r1712782, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java
Removed:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java
Modified:
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/wrappers/DatabaseWrapperLabelProvider.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java
Copied: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DatabaseTypeEnum.java (from r1712782, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DatabaseTypeEnum.java?p2=directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DatabaseTypeEnum.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java&r1=1712782&r2=1712922&rev=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseTypeEnum.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/model/DatabaseTypeEnum.java Fri Nov 6 09:00:57 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.databases;
+package org.apache.directory.studio.openldap.common.ui.model;
/**
@@ -120,4 +120,44 @@ public enum DatabaseTypeEnum
return name;
}
+
+
+ /**
+ * @return An array with all the Enum value's name
+ */
+ public static String[] getNames()
+ {
+ String[] names = new String[values().length];
+ int pos = 0;
+
+ for ( DatabaseTypeEnum databaseType : values() )
+ {
+ names[pos] = databaseType.name;
+ pos++;
+ }
+
+ return names;
+ }
+
+
+
+
+ /**
+ * Retrieve the instance associated to a String. Return NONE if not found.
+ *
+ * @param name The name to retrieve
+ * @return The DatabaseTypeEnum instance found, or NONE.
+ */
+ public static DatabaseTypeEnum getDatabaseType( String name )
+ {
+ for ( DatabaseTypeEnum databaseType : values() )
+ {
+ if ( databaseType.name.equalsIgnoreCase( name ) )
+ {
+ return databaseType;
+ }
+ }
+
+ return NONE;
+ }
}
\ No newline at end of file
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=1712922&r1=1712921&r2=1712922&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 Fri Nov 6 09:00:57 2015
@@ -34,6 +34,7 @@ import org.apache.directory.studio.commo
import org.apache.directory.studio.common.ui.wrappers.StringValueWrapper;
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.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.common.ui.model.RequireConditionEnum;
import org.apache.directory.studio.openldap.common.ui.model.RestrictOperationEnum;
import org.apache.directory.studio.openldap.common.ui.widgets.BooleanWithDefaultWidget;
@@ -327,7 +328,7 @@ public class DatabasesDetailsPage implem
// UI widgets
private Composite parentComposite;
private FormToolkit toolkit;
- private ComboViewer databaseTypeComboViewer;
+ //private ComboViewer databaseTypeComboViewer;
// UI General sesstings widgets
/** The olcSuffixDN attribute */
@@ -566,7 +567,7 @@ public class DatabasesDetailsPage implem
/**
* The listener that manage the specific database parameters
- */
+ *
private ISelectionChangedListener databaseTypeComboViewerSelectionChangedListener = new ISelectionChangedListener()
{
public void selectionChanged( SelectionChangedEvent event )
@@ -1624,7 +1625,7 @@ public class DatabasesDetailsPage implem
// the two specific Database (Frontend and Config)
if ( isFrontendDatabase( database ) )
{
- databaseTypeComboViewer.getControl().setEnabled( false );
+ //databaseTypeComboViewer.getControl().setEnabled( false );
suffixDnTableWidget.disable();
rootDnEntryWidget.setEnabled( false );
rootPasswordWidget.setEnabled( false );
@@ -1646,7 +1647,7 @@ public class DatabasesDetailsPage implem
}
else if ( isConfigDatabase( database ) )
{
- databaseTypeComboViewer.getControl().setEnabled( false );
+ //databaseTypeComboViewer.getControl().setEnabled( false );
suffixDnTableWidget.enable();
rootDnEntryWidget.setEnabled( true );
rootPasswordWidget.setEnabled( true );
@@ -1761,16 +1762,16 @@ public class DatabasesDetailsPage implem
// OlcHdbConfig Type
if ( database instanceof OlcHdbConfig )
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.HDB ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.HDB ) );
databaseSpecificDetailsBlock = new BerkeleyDbDatabaseSpecificDetailsBlock<OlcHdbConfig>( instance,
( OlcHdbConfig ) database, browserConnection );
}
// OlcBdbConfig Type
else if ( database instanceof OlcBdbConfig )
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.BDB ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.BDB ) );
databaseSpecificDetailsBlock = new BerkeleyDbDatabaseSpecificDetailsBlock<OlcBdbConfig>( instance,
( OlcBdbConfig ) database, browserConnection );
}
@@ -1785,24 +1786,24 @@ public class DatabasesDetailsPage implem
// OlcLdifConfig Type
else if ( database instanceof OlcLdifConfig )
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.LDIF ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.LDIF ) );
databaseSpecificDetailsBlock = new LdifDatabaseSpecificDetailsBlock( instance,
( OlcLdifConfig ) database );
}
// OlcNullConfig Type
else if ( database instanceof OlcNullConfig )
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.NULL ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.NULL ) );
databaseSpecificDetailsBlock = new NullDatabaseSpecificDetailsBlock( instance,
( OlcNullConfig ) database );
}
// OlcRelayConfig Type
else if ( database instanceof OlcRelayConfig )
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.RELAY ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.RELAY ) );
databaseSpecificDetailsBlock = new RelayDatabaseSpecificDetailsBlock( instance,
( OlcRelayConfig ) database, browserConnection );
}
@@ -1812,23 +1813,23 @@ public class DatabasesDetailsPage implem
// Looking for the frontend database
if ( isFrontendDatabase( database ) )
{
- databaseTypeComboViewer.setInput( FRONTEND_DATABASE_TYPES );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.FRONTEND ) );
+ //databaseTypeComboViewer.setInput( FRONTEND_DATABASE_TYPES );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.FRONTEND ) );
databaseSpecificDetailsBlock = new FrontendDatabaseSpecificDetailsBlock( instance, database,
browserConnection );
}
// Looking for the config database
else if ( isConfigDatabase( database ) )
{
- databaseTypeComboViewer.setInput( CONFIG_DATABASE_TYPES );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.CONFIG ) );
+ //databaseTypeComboViewer.setInput( CONFIG_DATABASE_TYPES );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.CONFIG ) );
databaseSpecificDetailsBlock = null;
}
// Any other type of database
else
{
- databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
- databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.NONE ) );
+ //databaseTypeComboViewer.setInput( DatabaseTypeEnum.values() );
+ //databaseTypeComboViewer.setSelection( new StructuredSelection( DatabaseTypeEnum.NONE ) );
databaseSpecificDetailsBlock = null;
}
}
@@ -1933,7 +1934,7 @@ public class DatabasesDetailsPage implem
addModifyListener( monitoringBooleanWithDefaultWidget, dirtyWidgetModifyListener );
//maxDerefDepthText.addModifyListener( dirtyModifyListener );
- addSelectionChangedListener( databaseTypeComboViewer, databaseTypeComboViewerSelectionChangedListener );
+ //addSelectionChangedListener( databaseTypeComboViewer, databaseTypeComboViewerSelectionChangedListener );
addDoubleClickListener( overlaysTableViewer, overlaysTableViewerDoubleClickListener );
addSelectionChangedListener( overlaysTableViewer, overlaysTableViewerSelectionChangedListener );
@@ -1983,7 +1984,7 @@ public class DatabasesDetailsPage implem
removeModifyListener( monitoringBooleanWithDefaultWidget, dirtyWidgetModifyListener );
//maxDerefDepthText.removeModifyListener( dirtyModifyListener );
- removeSelectionChangedListener( databaseTypeComboViewer, databaseTypeComboViewerSelectionChangedListener );
+ //removeSelectionChangedListener( databaseTypeComboViewer, databaseTypeComboViewerSelectionChangedListener );
removeDoubleClickListener( overlaysTableViewer, overlaysTableViewerDoubleClickListener );
removeSelectionChangedListener( overlaysTableViewer, overlaysTableViewerSelectionChangedListener );
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/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?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java Fri Nov 6 09:00:57 2015
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.util.Strings;
import org.apache.directory.studio.common.ui.CommonUIConstants;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
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.databases.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.eclipse.jface.viewers.StyledCellLabelProvider;
import org.eclipse.jface.viewers.StyledString;
@@ -102,8 +102,11 @@ public class DatabaseWrapperLabelProvide
if ( element instanceof DatabaseWrapper )
{
DatabaseWrapper database = (DatabaseWrapper) element;
+ OlcDatabaseConfig databaseConfig = database.getDatabase();
+ String databaseType = getDatabaseType( databaseConfig );
+ String databaseSuffix = getSuffix( databaseConfig );
- String databaseName = getDatabaseType( database.getDatabase() ) + " (" + getSuffix( database.getDatabase() ) + ")";
+ String databaseName = new StringBuilder( databaseType ).append( " (" ).append( databaseSuffix ).append( ")" ).toString();
// the olcDisabled AT is only present in 2.5
// TODO : check with the schemaManager
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcBdbConfig.java Fri Nov 6 09:00:57 2015
@@ -23,7 +23,7 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbPerlConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcDbSocketConfig.java Fri Nov 6 09:00:57 2015
@@ -23,7 +23,7 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcHdbConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLDAPConfig.java Fri Nov 6 09:00:57 2015
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcLdifConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMdbConfig.java Fri Nov 6 09:00:57 2015
@@ -23,7 +23,7 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMetaConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcMonitorConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNdbConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcNullConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcPasswdConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcRelayConfig.java Fri Nov 6 09:00:57 2015
@@ -21,7 +21,7 @@ package org.apache.directory.studio.open
import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
import org.apache.directory.studio.openldap.config.model.ConfigurationElement;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcShellConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java?rev=1712922&r1=1712921&r2=1712922&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/database/OlcSqlConfig.java Fri Nov 6 09:00:57 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.config.model.database;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabaseTypeEnum;
+import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
/**