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/04 10:56:54 UTC
svn commit: r1677554 [1/2] - in
/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config:
./ actions/ editor/ editor/databases/ editor/overlays/ editor/pages/ jobs/
model/ model/io/ wizards/
Author: elecharny
Date: Mon May 4 08:56:53 2015
New Revision: 1677554
URL: http://svn.apache.org/r1677554
Log:
Many changes in the OpenLDAP config editor :
- added an Overview page
- added the messages files to manage strings
- many classes have been renamed to avoid collision with the ApacheDS config editor
- Created a sub-package for pages
Added:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java
- copied, changed from r1676215, 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/OpenLDAPServerConfigurationEditorUtils.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorUtils.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ErrorPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/LoadingPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java
- copied, changed from r1676215, 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/pages/OptionsPage.java
- copied, changed from r1676215, 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/pages/OverlayType.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlayType.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverviewPage.java
- copied, changed from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OverviewPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages.properties
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_de.properties
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/messages_fr.properties
Removed:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ErrorPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/LoadingPage.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/OverviewPage.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/ServerConfigurationEditorUtils.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlayType.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysPage.java
Modified:
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginUtils.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorExportConfigurationAction.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorImportConfigurationAction.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenConfigurationAction.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenDirectoryConfigurationAction.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/messages.properties
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/jobs/LoadConfigurationRunnable.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OpenLdapConfiguration.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationReader.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/ConfigurationWriter.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/io/SaveConfigurationRunnable.java
directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/wizards/NewOpenLDAPConfigurationFileWizard.java
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginUtils.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginUtils.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/OpenLdapConfigurationPluginUtils.java Mon May 4 08:56:53 2015
@@ -52,6 +52,28 @@ public class OpenLdapConfigurationPlugin
return s;
}
+
+ /**
+ * Strips the ordering postfix if the given string contains one.
+ *
+ * @param s the string
+ * @return the string without the ordering postfix
+ */
+ public static String stripOrderingPostfix( String s )
+ {
+ if ( hasOrderingPostfix( s ) )
+ {
+ int indexOfOpeningCurlyBracket = s.indexOf( '{' );
+
+ if ( indexOfOpeningCurlyBracket != -1 )
+ {
+ return s.substring( 0, indexOfOpeningCurlyBracket );
+ }
+ }
+
+ return s;
+ }
+
/**
* Indicates if the given string contains an ordering prefix.
@@ -67,9 +89,22 @@ public class OpenLdapConfigurationPlugin
/**
- * Fetch the prefix from a String. The prefix must respect the folloing regexp :
+ * Indicates if the given string contains an ordering postfix.
+ *
+ * @param s the string
+ * @return <code>true</code> if the given string contains an ordering postfix,
+ * <code>false</code> if not.
+ */
+ public static boolean hasOrderingPostfix( String s )
+ {
+ return parseOrderingPostfix( s ) != null;
+ }
+
+
+ /**
+ * Fetch the prefix from a String. The prefix must respect the following regexp :
* <pre>
- * ^\{-?\d+\}
+ * ^\{-?\d+\}.*$
* </pre>
*/
private static Integer parseOrderingPrefix( String prefixString )
@@ -133,6 +168,81 @@ public class OpenLdapConfigurationPlugin
/**
+ * Fetch the postfix from a String. The postfix must respect the following regexp :
+ * <pre>
+ * ^.*\{-?\d+\}$
+ * </pre>
+ */
+ private static Integer parseOrderingPostfix( String postfixString )
+ {
+ if ( postfixString == null )
+ {
+ return null;
+ }
+
+ int pos = -1;
+
+ for ( int idx = 0; idx < postfixString.length(); idx++ )
+ {
+ if ( Strings.isCharASCII( postfixString, idx, '{') )
+ {
+ pos = idx + 1;
+ break;
+ }
+ }
+
+ if ( pos == -1 )
+ {
+ return null;
+ }
+
+ boolean positive = true;
+ int prefix = 0;
+
+ if ( Strings.isCharASCII( postfixString, pos, '-') )
+ {
+ positive = false;
+ }
+
+ char car;
+
+ while ( ( car = Strings.charAt( postfixString, pos++ ) ) != '\0' )
+ {
+ switch ( car )
+ {
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ prefix = prefix * 10 + car - '0';
+ break;
+
+ case '}' :
+ if ( positive )
+ {
+ return prefix;
+ }
+ else
+ {
+ return -prefix;
+ }
+
+ default :
+ return null;
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
* Gets the ordering prefix value (or -1 if none is found).
*
* @param prefixString the string
@@ -152,6 +262,27 @@ public class OpenLdapConfigurationPlugin
}
}
+
+ /**
+ * Gets the ordering postfix value (or -1 if none is found).
+ *
+ * @param postfixString the string
+ * @return the precedence value (or -1 if none is found).
+ */
+ public static int getOrderingPostfix( String postfixString )
+ {
+ Integer orderingPostfix = parseOrderingPostfix( postfixString );
+
+ if ( orderingPostfix == null )
+ {
+ return -1;
+ }
+ else
+ {
+ return orderingPostfix;
+ }
+ }
+
/**
* Gets the first value of the given list of values.
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorExportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorExportConfigurationAction.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorExportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorExportConfigurationAction.java Mon May 4 08:56:53 2015
@@ -27,8 +27,8 @@ import org.eclipse.osgi.util.NLS;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorUtils;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditorUtils;
/**
@@ -39,7 +39,7 @@ import org.apache.directory.studio.openl
public class EditorExportConfigurationAction extends Action
{
/** The associated editor */
- private ServerConfigurationEditor editor;
+ private OpenLDAPServerConfigurationEditor editor;
/**
@@ -48,7 +48,7 @@ public class EditorExportConfigurationAc
* @param editor
* the associated editor
*/
- public EditorExportConfigurationAction( ServerConfigurationEditor editor )
+ public EditorExportConfigurationAction( OpenLDAPServerConfigurationEditor editor )
{
this.editor = editor;
}
@@ -80,7 +80,7 @@ public class EditorExportConfigurationAc
{
try
{
- ServerConfigurationEditorUtils.saveAs( editor.getConfiguration(), false );
+ OpenLDAPServerConfigurationEditorUtils.saveAs( editor.getConfiguration(), false );
}
catch ( Exception e )
{
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorImportConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorImportConfigurationAction.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorImportConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/EditorImportConfigurationAction.java Mon May 4 08:56:53 2015
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Directory
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
import org.apache.directory.studio.openldap.config.model.io.ConfigurationReader;
@@ -44,7 +44,7 @@ import org.apache.directory.studio.openl
public class EditorImportConfigurationAction extends Action
{
/** The associated editor */
- private ServerConfigurationEditor editor;
+ private OpenLDAPServerConfigurationEditor editor;
/**
@@ -53,7 +53,7 @@ public class EditorImportConfigurationAc
* @param editor
* the associated editor
*/
- public EditorImportConfigurationAction( ServerConfigurationEditor editor )
+ public EditorImportConfigurationAction( OpenLDAPServerConfigurationEditor editor )
{
this.editor = editor;
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenConfigurationAction.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenConfigurationAction.java Mon May 4 08:56:53 2015
@@ -30,7 +30,7 @@ import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI;
import org.apache.directory.studio.openldap.config.editor.ConnectionServerConfigurationInput;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
/**
@@ -55,7 +55,7 @@ public class OpenConfigurationAction imp
{
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
.openEditor( new ConnectionServerConfigurationInput( selectedConnection ),
- ServerConfigurationEditor.ID );
+ OpenLDAPServerConfigurationEditor.ID );
}
catch ( Exception e )
{
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenDirectoryConfigurationAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenDirectoryConfigurationAction.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenDirectoryConfigurationAction.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/actions/OpenDirectoryConfigurationAction.java Mon May 4 08:56:53 2015
@@ -32,7 +32,7 @@ import org.eclipse.ui.IWorkbenchWindowAc
import org.eclipse.ui.PartInitException;
import org.apache.directory.studio.openldap.config.editor.DirectoryServerConfigurationInput;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
/**
@@ -75,7 +75,7 @@ public class OpenDirectoryConfigurationA
try
{
window.getActivePage().openEditor( new DirectoryServerConfigurationInput( new File(
- selectedDirectory ) ), ServerConfigurationEditor.ID );
+ selectedDirectory ) ), OpenLDAPServerConfigurationEditor.ID );
}
catch ( PartInitException e )
{
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java (from r1676215, 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/OpenLDAPServerConfigurationEditor.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditor.java&r1=1676215&r2=1677554&rev=1677554&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/OpenLDAPServerConfigurationEditor.java Mon May 4 08:56:53 2015
@@ -27,8 +27,13 @@ import org.apache.directory.studio.commo
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.ConfigPage;
-import org.apache.directory.studio.openldap.config.editor.databases.DatabasesPage;
import org.apache.directory.studio.openldap.config.editor.databases.FrontendPage;
+import org.apache.directory.studio.openldap.config.editor.pages.DatabasesPage;
+import org.apache.directory.studio.openldap.config.editor.pages.ErrorPage;
+import org.apache.directory.studio.openldap.config.editor.pages.LoadingPage;
+import org.apache.directory.studio.openldap.config.editor.pages.OpenLDAPServerConfigurationEditorPage;
+import org.apache.directory.studio.openldap.config.editor.pages.OptionsPage;
+import org.apache.directory.studio.openldap.config.editor.pages.OverviewPage;
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;
@@ -50,10 +55,10 @@ import org.eclipse.ui.forms.editor.FormE
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ServerConfigurationEditor extends FormEditor implements IPageChangedListener
+public class OpenLDAPServerConfigurationEditor extends FormEditor implements IPageChangedListener
{
/** The Editor ID */
- public static final String ID = ServerConfigurationEditor.class.getName();
+ public static final String ID = OpenLDAPServerConfigurationEditor.class.getName();
/** The flag indicating if the editor is dirty */
private boolean dirty = false;
@@ -61,7 +66,10 @@ public class ServerConfigurationEditor e
/** The configuration */
private OpenLdapConfiguration configuration;
- // The pages
+ // The pages for the Open LDAP configuration
+ /** The Overview page */
+ private OverviewPage overviewPage;
+
/** The page which is used for loading the configuration */
private LoadingPage loadingPage;
@@ -111,9 +119,9 @@ public class ServerConfigurationEditor e
{
Object selectedPage = event.getSelectedPage();
- if ( selectedPage instanceof ServerConfigurationEditorPage )
+ if ( selectedPage instanceof OpenLDAPServerConfigurationEditorPage )
{
- ( ( ServerConfigurationEditorPage ) selectedPage ).refreshUI();
+ ( ( OpenLDAPServerConfigurationEditorPage ) selectedPage ).refreshUI();
}
}
@@ -223,7 +231,7 @@ public class ServerConfigurationEditor e
doSavePages( monitor );
// Saving the configuration as a new file and getting the associated new editor input
- IEditorInput newInput = ServerConfigurationEditorUtils.saveAs( getConfiguration(), true );
+ IEditorInput newInput = OpenLDAPServerConfigurationEditorUtils.saveAs( getConfiguration(), true );
// Checking if the 'save as' is successful
if ( newInput != null )
@@ -340,6 +348,7 @@ public class ServerConfigurationEditor e
setDirty( true );
+ overviewPage.refreshUI();
optionsPage.refreshUI();
databasesPage.refreshUI();
frontendPage.refreshUI();
@@ -388,8 +397,12 @@ public class ServerConfigurationEditor e
// Adding the configuration pages
try
{
+ overviewPage = new OverviewPage( this );
+ addPage( overviewPage);
+
databasesPage = new DatabasesPage( this );
addPage( databasesPage );
+
optionsPage = new OptionsPage( this );
addPage( optionsPage );
}
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java (from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorUtils.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorUtils.java&r1=1676215&r2=1677554&rev=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorUtils.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditorUtils.java Mon May 4 08:56:53 2015
@@ -68,7 +68,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ServerConfigurationEditorUtils
+public class OpenLDAPServerConfigurationEditorUtils
{
/**
* Performs the "Save as..." action.
@@ -335,7 +335,7 @@ public class ServerConfigurationEditorUt
* <code>false</code> if not
* @throws Exception
*/
- public static void saveConfiguration( ConnectionServerConfigurationInput input, ServerConfigurationEditor editor,
+ public static void saveConfiguration( ConnectionServerConfigurationInput input, OpenLDAPServerConfigurationEditor editor,
IProgressMonitor monitor ) throws Exception
{
// Getting the browser connection associated with the connection in the input
Added: 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/databases/DatabaseWrapperLabelProvider.java?rev=1677554&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperLabelProvider.java Mon May 4 08:56:53 2015
@@ -0,0 +1,140 @@
+/*
+ * 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.databases;
+
+import java.util.List;
+
+import org.apache.directory.api.ldap.model.name.Dn;
+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.model.database.OlcDatabaseConfig;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * This class defines a label provider for a database wrapper viewer.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DatabaseWrapperLabelProvider extends LabelProvider
+{
+ /**
+ * Construct the label for a database. It's the type, followed by the suffixDN.
+ */
+ public String getText( Object element )
+ {
+ if ( element instanceof DatabaseWrapper )
+ {
+ OlcDatabaseConfig database = ( ( DatabaseWrapper ) element ).getDatabase();
+
+ return getDatabaseType( database ) + " (" + getSuffix( database ) + ")";
+ }
+
+ return super.getText( element );
+ };
+
+
+ /**
+ * Get the Database image, if it's a Database
+ */
+ public Image getImage( Object element )
+ {
+ if ( element instanceof DatabaseWrapper )
+ {
+ return OpenLdapConfigurationPlugin.getDefault().getImage(
+ OpenLdapConfigurationPluginConstants.IMG_DATABASE );
+ }
+
+ return super.getImage( element );
+ };
+
+
+ private String getDatabaseType( OlcDatabaseConfig database )
+ {
+ if ( database != null )
+ {
+ String databaseType = OpenLdapConfigurationPluginUtils.stripOrderingPrefix( database.getOlcDatabase() );
+
+ if ( "bdb".equalsIgnoreCase( databaseType ) )
+ {
+ return "BDB";
+ }
+ else if ( "hdb".equalsIgnoreCase( databaseType ) )
+ {
+ return "HDB";
+ }
+ else if ( "mdb".equalsIgnoreCase( databaseType ) )
+ {
+ return "MDB";
+ }
+ else if ( "ldap".equalsIgnoreCase( databaseType ) )
+ {
+ return "LDAP";
+ }
+ else if ( "ldif".equalsIgnoreCase( databaseType ) )
+ {
+ return "LDIF";
+ }
+ else if ( "null".equalsIgnoreCase( databaseType ) )
+ {
+ return "Null";
+ }
+ else if ( "relay".equalsIgnoreCase( databaseType ) )
+ {
+ return "Relay";
+ }
+ else if ( "frontend".equalsIgnoreCase( databaseType ) )
+ {
+ return "FrontEnd";
+ }
+ else if ( "config".equalsIgnoreCase( databaseType ) )
+ {
+ return "Config";
+ }
+ else
+ {
+ return "None";
+ }
+ }
+
+ return null;
+ }
+
+
+ /**
+ * Return the Database suffix DN
+ */
+ private String getSuffix( OlcDatabaseConfig database )
+ {
+ if ( database != null )
+ {
+ List<Dn> suffixes = database.getOlcSuffix();
+
+ if ( ( suffixes != null ) && ( suffixes.size() > 0 ) )
+ {
+ return suffixes.get( 0 ).toString();
+ }
+ }
+
+ return "none";
+ }
+
+}
Added: 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/databases/DatabaseWrapperViewerSorter.java?rev=1677554&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabaseWrapperViewerSorter.java Mon May 4 08:56:53 2015
@@ -0,0 +1,82 @@
+/*
+ * 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.databases;
+
+import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
+import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+
+/**
+ * This class defines a sorter for a database wrapper viewer.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class DatabaseWrapperViewerSorter extends ViewerSorter
+{
+ public int compare( Viewer viewer, Object e1, Object e2 )
+ {
+ if ( ( e1 != null ) && ( e2 != null ) && ( e1 instanceof DatabaseWrapper )
+ && ( e2 instanceof DatabaseWrapper ) )
+ {
+ OlcDatabaseConfig database1 = ( ( DatabaseWrapper ) e1 ).getDatabase();
+ OlcDatabaseConfig database2 = ( ( DatabaseWrapper ) e2 ).getDatabase();
+ boolean db1HasOrderingPrefix = OpenLdapConfigurationPluginUtils.hasOrderingPrefix( database1
+ .getOlcDatabase() );
+ boolean db2HasOrderingPrefix = OpenLdapConfigurationPluginUtils.hasOrderingPrefix( database2
+ .getOlcDatabase() );
+
+ if ( db1HasOrderingPrefix && db2HasOrderingPrefix )
+ {
+ int orderingPrefix1 = OpenLdapConfigurationPluginUtils.getOrderingPrefix( database1
+ .getOlcDatabase() );
+ int orderingPrefix2 = OpenLdapConfigurationPluginUtils.getOrderingPrefix( database2
+ .getOlcDatabase() );
+
+ if ( orderingPrefix1 > orderingPrefix2 )
+ {
+ return Integer.MAX_VALUE;
+ }
+ else if ( orderingPrefix1 < orderingPrefix2 )
+ {
+ return Integer.MIN_VALUE;
+ }
+ else
+ {
+ return 0;
+ }
+ }
+ else if ( db1HasOrderingPrefix )
+ {
+ return Integer.MIN_VALUE;
+ }
+ else if ( db2HasOrderingPrefix )
+ {
+ return Integer.MAX_VALUE;
+ }
+ else
+ {
+ return 1;
+ }
+ }
+
+ return super.compare( viewer, e1, e2 );
+ }
+}
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=1677554&r1=1677553&r2=1677554&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 Mon May 4 08:56:53 2015
@@ -26,26 +26,21 @@ 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.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.pages.DatabasesPage;
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;
import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -638,7 +633,7 @@ public class DatabasesMasterDetailsBlock
*/
public void setEditorDirty()
{
- ( ( ServerConfigurationEditor ) page.getEditor() ).setDirty( true );
+ ( ( OpenLDAPServerConfigurationEditor ) page.getEditor() ).setDirty( true );
detailsPage.commit( false );
viewer.refresh();
}
@@ -687,169 +682,7 @@ public class DatabasesMasterDetailsBlock
for ( DatabaseWrapper databaseWrapper : databaseWrappers )
{
- getPage().getConfiguration().addDatabase( databaseWrapper.getDatabase() );
- }
- }
-
- /**
- * This class defines a label provider for a database wrapper viewer.
- */
- private class DatabaseWrapperLabelProvider extends LabelProvider
- {
- /**
- * Construct the label for a database. It's the type, followed by the suffixDN.
- */
- public String getText( Object element )
- {
- if ( element instanceof DatabaseWrapper )
- {
- OlcDatabaseConfig database = ( ( DatabaseWrapper ) element ).getDatabase();
-
- return getDatabaseType( database ) + " (" + getSuffix( database ) + ")";
- }
-
- return super.getText( element );
- };
-
-
- /**
- * Get the Database image, if it's a Database
- */
- public Image getImage( Object element )
- {
- if ( element instanceof DatabaseWrapper )
- {
- return OpenLdapConfigurationPlugin.getDefault().getImage(
- OpenLdapConfigurationPluginConstants.IMG_DATABASE );
- }
-
- return super.getImage( element );
- };
-
-
- private String getDatabaseType( OlcDatabaseConfig database )
- {
- if ( database != null )
- {
- String databaseType = OpenLdapConfigurationPluginUtils.stripOrderingPrefix( database.getOlcDatabase() );
-
- if ( "bdb".equalsIgnoreCase( databaseType ) )
- {
- return "BDB";
- }
- else if ( "hdb".equalsIgnoreCase( databaseType ) )
- {
- return "HDB";
- }
- else if ( "mdb".equalsIgnoreCase( databaseType ) )
- {
- return "MDB";
- }
- else if ( "ldap".equalsIgnoreCase( databaseType ) )
- {
- return "LDAP";
- }
- else if ( "ldif".equalsIgnoreCase( databaseType ) )
- {
- return "LDIF";
- }
- else if ( "null".equalsIgnoreCase( databaseType ) )
- {
- return "Null";
- }
- else if ( "relay".equalsIgnoreCase( databaseType ) )
- {
- return "Relay";
- }
- else if ( "frontend".equalsIgnoreCase( databaseType ) )
- {
- return "FrontEnd";
- }
- else if ( "config".equalsIgnoreCase( databaseType ) )
- {
- return "Config";
- }
- else
- {
- return "None";
- }
- }
-
- return null;
- }
-
-
- /**
- * Return the Database suffix DN
- */
- private String getSuffix( OlcDatabaseConfig database )
- {
- if ( database != null )
- {
- List<Dn> suffixes = database.getOlcSuffix();
-
- if ( ( suffixes != null ) && ( suffixes.size() > 0 ) )
- {
- return suffixes.get( 0 ).toString();
- }
- }
-
- return "none";
- }
- }
-
- /**
- * This class defines a sorter for a database wrapper viewer.
- */
- private class DatabaseWrapperViewerSorter extends ViewerSorter
- {
- public int compare( Viewer viewer, Object e1, Object e2 )
- {
- if ( ( e1 != null ) && ( e2 != null ) && ( e1 instanceof DatabaseWrapper )
- && ( e2 instanceof DatabaseWrapper ) )
- {
- OlcDatabaseConfig database1 = ( ( DatabaseWrapper ) e1 ).getDatabase();
- OlcDatabaseConfig database2 = ( ( DatabaseWrapper ) e2 ).getDatabase();
- boolean db1HasOrderingPrefix = OpenLdapConfigurationPluginUtils.hasOrderingPrefix( database1
- .getOlcDatabase() );
- boolean db2HasOrderingPrefix = OpenLdapConfigurationPluginUtils.hasOrderingPrefix( database2
- .getOlcDatabase() );
-
- if ( db1HasOrderingPrefix && db2HasOrderingPrefix )
- {
- int orderingPrefix1 = OpenLdapConfigurationPluginUtils.getOrderingPrefix( database1
- .getOlcDatabase() );
- int orderingPrefix2 = OpenLdapConfigurationPluginUtils.getOrderingPrefix( database2
- .getOlcDatabase() );
-
- if ( orderingPrefix1 > orderingPrefix2 )
- {
- return Integer.MAX_VALUE;
- }
- else if ( orderingPrefix1 < orderingPrefix2 )
- {
- return Integer.MIN_VALUE;
- }
- else
- {
- return 0;
- }
- }
- else if ( db1HasOrderingPrefix )
- {
- return Integer.MIN_VALUE;
- }
- else if ( db2HasOrderingPrefix )
- {
- return Integer.MAX_VALUE;
- }
- else
- {
- return 1;
- }
- }
-
- return super.compare( viewer, e1, e2 );
+ getPage().getConfiguration().add( databaseWrapper.getDatabase() );
}
}
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/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/messages.properties?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/messages.properties (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/messages.properties Mon May 4 08:56:53 2015
@@ -31,3 +31,5 @@ ServerConfigurationEditor.SavingServerCo
ServerConfigurationEditorUtils.ChangesCouldNotBeSavedToConnection=Changes could not be saved to the connection.
ServerConfigurationEditorUtils.Question=Question
ServerConfigurationEditorUtils.TheFileAlreadyExistsWantToReplace=The file "{0}" already exists. Do you want to replace the existing file?
+
+OptionsPage.LogTitle=Logs
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java?rev=1677554&r1=1677553&r2=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysMasterDetailsBlock.java Mon May 4 08:56:53 2015
@@ -43,6 +43,7 @@ import org.eclipse.ui.forms.widgets.Form
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.editor.pages.OverlaysPage;
import org.apache.directory.studio.openldap.config.model.OlcChainConfig;
import org.apache.directory.studio.openldap.config.model.OlcConfig;
import org.apache.directory.studio.openldap.config.model.OlcDistProcConfig;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java (from r1676215, 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/pages/DatabasesPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/DatabasesPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/DatabasesPage.java&r1=1676215&r2=1677554&rev=1677554&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/pages/DatabasesPage.java Mon May 4 08:56:53 2015
@@ -17,11 +17,11 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.databases;
+package org.apache.directory.studio.openldap.config.editor.pages;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorPage;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.databases.DatabasesMasterDetailsBlock;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -32,7 +32,7 @@ import org.eclipse.ui.forms.widgets.Form
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DatabasesPage extends ServerConfigurationEditorPage
+public class DatabasesPage extends OpenLDAPServerConfigurationEditorPage
{
/** The Page ID*/
public static final String ID = DatabasesPage.class.getName(); //$NON-NLS-1$
@@ -49,7 +49,7 @@ public class DatabasesPage extends Serve
*
* @param editor the associated editor
*/
- public DatabasesPage( ServerConfigurationEditor editor )
+ public DatabasesPage( OpenLDAPServerConfigurationEditor editor )
{
super( editor, ID, TITLE );
}
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java (from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ErrorPage.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/ErrorPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ErrorPage.java&r1=1676215&r2=1677554&rev=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ErrorPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/ErrorPage.java Mon May 4 08:56:53 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor;
+package org.apache.directory.studio.openldap.config.editor.pages;
import java.io.PrintWriter;
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java (from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/LoadingPage.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/LoadingPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/LoadingPage.java&r1=1676215&r2=1677554&rev=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/LoadingPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/LoadingPage.java Mon May 4 08:56:53 2015
@@ -17,9 +17,10 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor;
+package org.apache.directory.studio.openldap.config.editor.pages;
+import org.apache.directory.studio.openldap.config.editor.Messages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.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/Messages.java?rev=1677554&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/Messages.java Mon May 4 08:56:53 2015
@@ -0,0 +1,55 @@
+/*
+ * 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.MissingResourceException;
+import java.util.ResourceBundle;
+
+
+/**
+ * This class get messages from the resources file for the OpenLDAP pages.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class Messages
+{
+ /** The resource name */
+ private static final ResourceBundle RESOURCE_BUNDLE =
+ ResourceBundle.getBundle( Messages.class.getPackage().getName() + ".messages" );
+
+ /**
+ * Get back a message from the resource file given a key
+ *
+ * @param key The key associated with the message
+ * @return The found message
+ */
+ public static String getString( String key )
+ {
+ try
+ {
+ return RESOURCE_BUNDLE.getString( key );
+ }
+ catch ( MissingResourceException e )
+ {
+ return '!' + key + '!';
+ }
+ }
+}
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java (from r1676215, 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/pages/OpenLDAPServerConfigurationEditorPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/ServerConfigurationEditorPage.java&r1=1676215&r2=1677554&rev=1677554&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/pages/OpenLDAPServerConfigurationEditorPage.java Mon May 4 08:56:53 2015
@@ -17,11 +17,15 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor;
+package org.apache.directory.studio.openldap.config.editor.pages;
+import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
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.editor.Messages;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
import org.apache.directory.studio.openldap.config.model.OpenLdapConfiguration;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.Separator;
@@ -46,6 +50,7 @@ import org.eclipse.ui.forms.IManagedForm
import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.eclipse.ui.forms.widgets.Section;
/**
@@ -53,7 +58,7 @@ import org.eclipse.ui.forms.widgets.Scro
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class ServerConfigurationEditorPage extends FormPage
+public abstract class OpenLDAPServerConfigurationEditorPage extends FormPage
{
protected static final Color GRAY_COLOR = new Color( null, 120, 120, 120 );
protected static final String TABULATION = " ";
@@ -61,6 +66,9 @@ public abstract class ServerConfiguratio
/** A flag to indicate if the page is initialized */
protected boolean isInitialized = false;
+ /**
+ * A listener used to set the dirty flag when a Text is updated
+ */
private ModifyListener dirtyModifyListener = new ModifyListener()
{
public void modifyText( ModifyEvent e )
@@ -69,6 +77,9 @@ public abstract class ServerConfiguratio
}
};
+ /**
+ * A listener used to set the dirty flag when a widget is selected
+ */
private SelectionListener dirtySelectionListener = new SelectionAdapter()
{
public void widgetSelected( SelectionEvent e )
@@ -77,13 +88,24 @@ public abstract class ServerConfiguratio
}
};
+ /**
+ * A listener used to set the dirty flag when a widget is updated
+ */
+ protected WidgetModifyListener dirtyWidgetModifyListener = new WidgetModifyListener()
+ {
+ public void widgetModified( WidgetModifyEvent event )
+ {
+ setEditorDirty();
+ }
+ };
+
/**
* Creates a new instance of GeneralPage.
*
* @param editor the associated editor
*/
- public ServerConfigurationEditorPage( ServerConfigurationEditor editor, String id, String title )
+ public OpenLDAPServerConfigurationEditorPage( OpenLDAPServerConfigurationEditor editor, String id, String title )
{
super( editor, id, title );
}
@@ -94,9 +116,9 @@ public abstract class ServerConfiguratio
*
* @return the ServerConfigurationEditor object associated with the page
*/
- public ServerConfigurationEditor getServerConfigurationEditor()
+ public OpenLDAPServerConfigurationEditor getServerConfigurationEditor()
{
- return ( ServerConfigurationEditor ) getEditor();
+ return ( OpenLDAPServerConfigurationEditor ) getEditor();
}
@@ -142,7 +164,7 @@ public abstract class ServerConfiguratio
FormToolkit toolkit = managedForm.getToolkit();
toolkit.decorateFormHeading( form.getForm() );
- ServerConfigurationEditor editor = ( ServerConfigurationEditor ) getEditor();
+ OpenLDAPServerConfigurationEditor editor = ( OpenLDAPServerConfigurationEditor ) getEditor();
IToolBarManager toolbarManager = form.getToolBarManager();
toolbarManager.add( new EditorImportConfigurationAction( editor ) );
@@ -169,7 +191,7 @@ public abstract class ServerConfiguratio
/**
* Refreshes the UI.
*/
- protected abstract void refreshUI();
+ public abstract void refreshUI();
/**
@@ -211,6 +233,33 @@ public abstract class ServerConfiguratio
return portText;
}
+
+
+ /**
+ * A shared method used to create a Section, based on a GridLayout.
+ *
+ * @param toolkit The Form toolkit
+ * @param parent The parent
+ * @param title The Section title
+ * @param nbColumns The number of columns for the inner grid
+ *
+ * @return The created Composite
+ */
+ protected Composite createSection( FormToolkit toolkit, Composite parent, String title, int nbColumns, int style )
+ {
+ Section section = toolkit.createSection( parent, style );
+ section.setText( Messages.getString( title ) );
+ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ Composite composite = toolkit.createComposite( section );
+ toolkit.paintBordersFor( composite );
+ GridLayout gridLayout = new GridLayout( nbColumns, false );
+ gridLayout.marginHeight = 0;
+ gridLayout.marginWidth = 0;
+ composite.setLayout( gridLayout );
+ section.setClient( composite );
+
+ return composite;
+ }
/**
@@ -254,10 +303,8 @@ public abstract class ServerConfiguratio
/**
* Adds a selection listener to the given Button.
*
- * @param button
- * the Button control
- * @param listener
- * the listener
+ * @param button the Button control
+ * @param listener the listener
*/
protected void addSelectionListener( Button button, SelectionListener listener )
{
@@ -397,4 +444,17 @@ public abstract class ServerConfiguratio
control.setFocus();
}
}
+
+
+ /**
+ * Create an expandable Section with a title
+ */
+ protected Section createSection( FormToolkit toolkit, Composite parent, String title )
+ {
+ Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED);
+ section.setText( title ); //$NON-NLS-1$
+ section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ return section;
+ }
}
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java (from r1676215, 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/pages/OptionsPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OptionsPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OptionsPage.java&r1=1676215&r2=1677554&rev=1677554&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/pages/OptionsPage.java Mon May 4 08:56:53 2015
@@ -17,11 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor;
+package org.apache.directory.studio.openldap.config.editor.pages;
import java.util.List;
+import org.apache.directory.studio.openldap.config.editor.Messages;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
import org.apache.directory.studio.openldap.config.model.OlcGlobal;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -39,7 +41,7 @@ import org.eclipse.ui.forms.widgets.Tabl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OptionsPage extends ServerConfigurationEditorPage
+public class OptionsPage extends OpenLDAPServerConfigurationEditorPage
{
/** The Page ID*/
public static final String ID = OptionsPage.class.getName(); //$NON-NLS-1$
@@ -48,8 +50,15 @@ public class OptionsPage extends ServerC
private static final String TITLE = "Options";
// UI Controls
+ /** The olcLogFile parameter */
private Text logFileText;
+
+ /** The olcLogLevel parameter */
private Text logLevelText;
+
+ /** The olcPluginLogFile parameter */
+ private Text pluginLogFileText;
+
private Text maxPduSizeAnonymousSessionsText;
private Text maxPduSizeAuthenticatedSessionsText;
private Text tcpBufferSizeText;
@@ -89,12 +98,13 @@ public class OptionsPage extends ServerC
*
* @param editor the associated editor
*/
- public OptionsPage( ServerConfigurationEditor editor )
+ public OptionsPage( OpenLDAPServerConfigurationEditor editor )
{
super( editor, ID, TITLE );
}
+
/**
* {@inheritDoc}
*/
@@ -138,7 +148,8 @@ public class OptionsPage extends ServerC
*/
private void createLogsSection( FormToolkit toolkit, Composite parent )
{
- Section section = createSection( toolkit, parent, "Logs" );
+ // The Logs section, which can be expanded or compacted
+ Section section = createSection( toolkit, parent, Messages.getString( "OptionsPage.LogTitle" ) );
Composite composite = createSectionComposite( toolkit, section, 2, false );
// Log File Text
@@ -150,6 +161,11 @@ public class OptionsPage extends ServerC
toolkit.createLabel( composite, "Log Level:" );
logLevelText = toolkit.createText( composite, "" );
logLevelText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // Plugin Log File Text
+ toolkit.createLabel( composite, "Plugin Log File:" );
+ pluginLogFileText = toolkit.createText( composite, "" );
+ pluginLogFileText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
@@ -406,6 +422,22 @@ public class OptionsPage extends ServerC
authzUsernamesToDnRegexpText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
}
+
+ /**
+ * Adds listeners to UI Controls.
+ */
+ private void addListeners()
+ {
+ }
+
+
+ /**
+ * Removes listeners to UI Controls.
+ */
+ private void removeListeners()
+ {
+ }
+
/**
* Creates a section with the given text.
@@ -414,12 +446,13 @@ public class OptionsPage extends ServerC
* @param parent the parent composite
* @param text the text
* @return a section with the given text
- */
+ *
private Section createSection( FormToolkit toolkit, Composite parent, String text )
{
- Section section = toolkit.createSection( parent, Section.TITLE_BAR );
+ Section section = toolkit.createSection( parent, Section.TITLE_BAR | Section.TWISTIE | Section.EXPANDED );
section.setText( text );
section.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
return section;
}
@@ -450,10 +483,12 @@ public class OptionsPage extends ServerC
/**
* {@inheritDoc}
*/
- protected void refreshUI()
+ public void refreshUI()
{
if ( isInitialized() )
{
+ removeListeners();
+
// Getting the global configuration object
OlcGlobal global = getConfiguration().getGlobal();
@@ -486,6 +521,18 @@ public class OptionsPage extends ServerC
{
logLevelText.setText( "" );
}
+
+ // Plugin Log File Text
+ String pluginLogFile = global.getOlcPluginLogFile();
+
+ if ( pluginLogFile != null )
+ {
+ pluginLogFileText.setText( pluginLogFile );
+ }
+ else
+ {
+ pluginLogFileText.setText( "" );
+ }
// Max PDU Size Anonymous Sessions Text
String maxPduSizeAnonymousSessions = global.getOlcSockbufMaxIncoming();
@@ -872,6 +919,8 @@ public class OptionsPage extends ServerC
{
authzUsernamesToDnRegexpText.setText( "" );
}
+
+ addListeners();
}
}
}
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlayType.java (from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlayType.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/OverlayType.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlayType.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlayType.java&r1=1676215&r2=1677554&rev=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlayType.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlayType.java Mon May 4 08:56:53 2015
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.overlays;
+package org.apache.directory.studio.openldap.config.editor.pages;
/**
Copied: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java (from r1676215, directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysPage.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/OverlaysPage.java?p2=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java&p1=directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysPage.java&r1=1676215&r2=1677554&rev=1677554&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/overlays/OverlaysPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OverlaysPage.java Mon May 4 08:56:53 2015
@@ -17,14 +17,13 @@
* under the License.
*
*/
-package org.apache.directory.studio.openldap.config.editor.overlays;
+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.ServerConfigurationEditor;
-import org.apache.directory.studio.openldap.config.editor.ServerConfigurationEditorPage;
+import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
+import org.apache.directory.studio.openldap.config.editor.overlays.OverlaysMasterDetailsBlock;
/**
@@ -32,7 +31,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OverlaysPage extends ServerConfigurationEditorPage
+public class OverlaysPage extends OpenLDAPServerConfigurationEditorPage
{
/** The Page ID*/
public static final String ID = OverlaysPage.class.getName(); //$NON-NLS-1$
@@ -49,7 +48,7 @@ public class OverlaysPage extends Server
* @param editor
* the associated editor
*/
- public OverlaysPage( ServerConfigurationEditor editor )
+ public OverlaysPage( OpenLDAPServerConfigurationEditor editor )
{
super( editor, ID, TITLE );
}