You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/05/22 17:51:39 UTC
svn commit: r1681156 [2/3] - in /directory/studio/trunk/plugins:
aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueeditors/
apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/
combine...
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java Fri May 22 15:51:37 2015
@@ -22,9 +22,9 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.connection.core.Utils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.SearchPageWrapper;
import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/BrowserConnectionWidgetContributionItem.java Fri May 22 15:51:37 2015
@@ -21,13 +21,13 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
import org.apache.directory.studio.connection.core.event.ConnectionUpdateListener;
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.action.ContributionItem;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/search/SearchPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/search/SearchPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/search/SearchPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/search/SearchPage.java Fri May 22 15:51:37 2015
@@ -22,9 +22,9 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.SearchPageWrapper;
import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java Fri May 22 15:51:37 2015
@@ -29,10 +29,10 @@ import java.util.Set;
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.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.SearchPageWrapper;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationLdifWizardPage.java Fri May 22 15:51:37 2015
@@ -21,8 +21,8 @@
package org.apache.directory.studio.ldapbrowser.ui.wizards;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldifeditor.widgets.LdifEditorWidget;
import org.apache.directory.studio.ldifparser.model.LdifFile;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationModifyWizardPage.java Fri May 22 15:51:37 2015
@@ -21,9 +21,9 @@
package org.apache.directory.studio.ldapbrowser.ui.wizards;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.ModWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldifparser.model.LdifFile;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseFromWizardPage.java Fri May 22 15:51:37 2015
@@ -22,8 +22,8 @@ package org.apache.directory.studio.ldap
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.SearchPageWrapper;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Composite;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportBaseToPage.java Fri May 22 15:51:37 2015
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.io.File;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.events.SelectionAdapter;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ExportConnectionsWizardPage.java Fri May 22 15:51:37 2015
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.io.File;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
import org.eclipse.jface.wizard.WizardPage;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportConnectionsWizardPage.java Fri May 22 15:51:37 2015
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.io.File;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
import org.eclipse.jface.wizard.WizardPage;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportDsmlMainWizardPage.java Fri May 22 15:51:37 2015
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.io.File;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/ImportLdifMainWizardPage.java Fri May 22 15:51:37 2015
@@ -24,9 +24,9 @@ package org.apache.directory.studio.ldap
import java.io.File;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.FileBrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.ldap
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
import org.eclipse.jface.wizard.WizardPage;
Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java Fri May 22 15:51:37 2015
@@ -27,6 +27,8 @@ import java.util.ResourceBundle;
import org.apache.directory.studio.common.ui.CommonUIUtils;
import org.apache.directory.studio.common.ui.filesystem.PathEditorInput;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.apache.directory.studio.connection.core.event.ConnectionEventRegistry;
@@ -34,8 +36,6 @@ import org.apache.directory.studio.conne
import org.apache.directory.studio.connection.ui.ConnectionUIPlugin;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.actions.ValueEditorPreferencesAction;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.BrowserConnectionWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldifeditor.LdifEditorActivator;
Modified: directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java (original)
+++ directory/studio/trunk/plugins/ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/widgets/LdifEditorWidget.java Fri May 22 15:51:37 2015
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldifeditor.widgets;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldifeditor.editor.ILdifEditor;
import org.apache.directory.studio.ldifeditor.editor.LdifDocumentProvider;
@@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Control;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LdifEditorWidget extends BrowserWidget implements ILdifEditor, ITextListener
+public class LdifEditorWidget extends AbstractWidget implements ILdifEditor, ITextListener
{
/** The connection. */
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/AttributesWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/AttributesWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/AttributesWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/AttributesWidget.java Fri May 22 15:51:37 2015
@@ -24,10 +24,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.studio.common.ui.HistoryUtils;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.bindings.keys.KeyStroke;
import org.eclipse.jface.fieldassist.ComboContentAdapter;
@@ -43,7 +43,6 @@ import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclEditorPlugin;
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclEditorPluginConstants;
@@ -52,7 +51,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AttributesWidget extends BrowserWidget
+public class AttributesWidget extends AbstractWidget
{
/** The initial attributes. */
private String[] initialAttributes;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhatClauseWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhatClauseWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhatClauseWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhatClauseWidget.java Fri May 22 15:51:37 2015
@@ -20,15 +20,14 @@
package org.apache.directory.studio.openldap.config.acl.widgets;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
-
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclValueWithContext;
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClause;
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseAttributes;
@@ -43,7 +42,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OpenLdapAclWhatClauseWidget extends BrowserWidget
+public class OpenLdapAclWhatClauseWidget extends AbstractWidget
{
/** The visual editor composite */
private OpenLdapAclVisualEditorComposite visualEditorComposite;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClauseWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClauseWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClauseWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClauseWidget.java Fri May 22 15:51:37 2015
@@ -22,8 +22,8 @@ package org.apache.directory.studio.open
import java.text.MessageFormat;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -36,7 +36,6 @@ import org.eclipse.swt.events.SelectionL
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.ToolBar;
import org.eclipse.swt.widgets.ToolItem;
-
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclEditorPlugin;
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclEditorPluginConstants;
import org.apache.directory.studio.openldap.config.acl.dialogs.OpenLdapAccessLevelDialog;
@@ -69,7 +68,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OpenLdapAclWhoClauseWidget extends BrowserWidget implements SelectionListener
+public class OpenLdapAclWhoClauseWidget extends AbstractWidget implements SelectionListener
{
/** The array of clauses */
private Object[] clauses = new Object[]
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClausesBuilderWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClausesBuilderWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClausesBuilderWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/OpenLdapAclWhoClausesBuilderWidget.java Fri May 22 15:51:37 2015
@@ -24,14 +24,13 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-
import org.apache.directory.studio.openldap.config.acl.OpenLdapAclValueWithContext;
import org.apache.directory.studio.openldap.config.acl.model.AclWhoClause;
import org.apache.directory.studio.openldap.config.acl.model.AclWhoClauseStar;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseAttributesComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseAttributesComposite.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseAttributesComposite.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseAttributesComposite.java Fri May 22 15:51:37 2015
@@ -23,11 +23,10 @@ package org.apache.directory.studio.open
import java.util.Arrays;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.swt.widgets.Composite;
-
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseAttributes;
import org.apache.directory.studio.openldap.config.acl.widgets.AttributesWidget;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseDnComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseDnComposite.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseDnComposite.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseDnComposite.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
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.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -33,7 +33,6 @@ import org.eclipse.jface.viewers.LabelPr
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseDn;
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseDnTypeEnum;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseFilterComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseFilterComposite.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseFilterComposite.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhatClauseFilterComposite.java Fri May 22 15:51:37 2015
@@ -21,12 +21,11 @@ package org.apache.directory.studio.open
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.FilterWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.swt.widgets.Composite;
-
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseFilter;
Modified: directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhoClauseDnComposite.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhoClauseDnComposite.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhoClauseDnComposite.java (original)
+++ directory/studio/trunk/plugins/openldap.acl.editor/src/main/java/org/apache/directory/studio/openldap/config/acl/widgets/composites/WhoClauseDnComposite.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
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.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -33,7 +33,6 @@ import org.eclipse.jface.viewers.LabelPr
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-
import org.apache.directory.studio.openldap.config.acl.model.AclWhatClauseDnTypeEnum;
import org.apache.directory.studio.openldap.config.acl.model.AclWhoClauseDn;
import org.apache.directory.studio.openldap.config.acl.model.AclWhoClauseDnTypeEnum;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/BooleanWithDefaultWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/BooleanWithDefaultWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/BooleanWithDefaultWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/BooleanWithDefaultWidget.java Fri May 22 15:51:37 2015
@@ -20,7 +20,7 @@
package org.apache.directory.studio.openldap.common.ui.widgets;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.eclipse.jface.viewers.ArrayContentProvider;
import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.forms.widgets.FormToolkit;
-public class BooleanWithDefaultWidget extends BrowserWidget
+public class BooleanWithDefaultWidget extends AbstractWidget
{
/** The combo viewer's values */
private Object[] comboViewerValues = new Object[]
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/DirectoryBrowserWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/DirectoryBrowserWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/DirectoryBrowserWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/DirectoryBrowserWidget.java Fri May 22 15:51:37 2015
@@ -23,10 +23,10 @@ package org.apache.directory.studio.open
import java.io.File;
import org.apache.directory.studio.common.ui.HistoryUtils;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.Messages;
import org.apache.directory.studio.openldap.common.ui.OpenLdapCommonUiConstants;
import org.apache.directory.studio.openldap.common.ui.OpenLdapCommonUiPlugin;
@@ -47,7 +47,7 @@ import org.eclipse.ui.forms.widgets.Form
* The DirectoryBrowserWidget provides a combo with a history of recently
* used directory and a browse button to open the directory browser.
*/
-public class DirectoryBrowserWidget extends BrowserWidget
+public class DirectoryBrowserWidget extends AbstractWidget
{
/** The combo with the history of recently used directories */
protected Combo directoryCombo;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/EntryWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/EntryWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/EntryWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/EntryWidget.java Fri May 22 15:51:37 2015
@@ -24,12 +24,12 @@ package org.apache.directory.studio.open
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.HistoryUtils;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
import org.apache.directory.studio.ldapbrowser.common.dialogs.SelectEntryDialog;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.Messages;
import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryRunnable;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -60,7 +60,7 @@ import org.eclipse.ui.forms.widgets.Form
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EntryWidget extends BrowserWidget
+public class EntryWidget extends AbstractWidget
{
/** The connection. */
private IBrowserConnection browserConnection;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogLevelWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogLevelWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogLevelWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogLevelWidget.java Fri May 22 15:51:37 2015
@@ -20,8 +20,8 @@
package org.apache.directory.studio.openldap.common.ui.widgets;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -61,7 +61,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LogLevelWidget extends BrowserWidget
+public class LogLevelWidget extends AbstractWidget
{
/** The log level */
private int value;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogOperationsWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogOperationsWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogOperationsWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/LogOperationsWidget.java Fri May 22 15:51:37 2015
@@ -23,8 +23,8 @@ package org.apache.directory.studio.open
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.forms.widgets.FormToolkit;
-public class LogOperationsWidget extends BrowserWidget
+public class LogOperationsWidget extends AbstractWidget
{
// UI widgets
private Composite composite;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/PasswordWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/PasswordWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/PasswordWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/PasswordWidget.java Fri May 22 15:51:37 2015
@@ -20,8 +20,8 @@
package org.apache.directory.studio.openldap.common.ui.widgets;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
-
import org.apache.directory.studio.openldap.common.ui.dialogs.PasswordDialog;
@@ -41,7 +40,7 @@ import org.apache.directory.studio.openl
* The PasswordWidget provides a label to display the password, an edit button
* and a 'Show Password' button to show/hide the password.
*/
-public class PasswordWidget extends BrowserWidget
+public class PasswordWidget extends AbstractWidget
{
/** The password */
private byte[] password;
Modified: directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/UnixPermissionsWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/UnixPermissionsWidget.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/UnixPermissionsWidget.java (original)
+++ directory/studio/trunk/plugins/openldap.common.ui/src/main/java/org/apache/directory/studio/openldap/common/ui/widgets/UnixPermissionsWidget.java Fri May 22 15:51:37 2015
@@ -22,8 +22,8 @@ package org.apache.directory.studio.open
import java.text.ParseException;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -36,7 +36,6 @@ import org.eclipse.swt.widgets.Composite
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.forms.widgets.FormToolkit;
-
import org.apache.directory.studio.openldap.common.ui.dialogs.UnixPermissions;
import org.apache.directory.studio.openldap.common.ui.dialogs.UnixPermissionsDialog;
@@ -45,7 +44,7 @@ import org.apache.directory.studio.openl
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class UnixPermissionsWidget extends BrowserWidget
+public class UnixPermissionsWidget extends AbstractWidget
{
// The value
private String value;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.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?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/OpenLDAPServerConfigurationEditor.java Fri May 22 15:51:37 2015
@@ -34,6 +34,8 @@ import org.apache.directory.studio.openl
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.editor.pages.SecurityPage;
+import org.apache.directory.studio.openldap.config.editor.pages.TuningPage;
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;
@@ -84,6 +86,12 @@ public class OpenLDAPServerConfiguration
/** The options page */
private OptionsPage optionsPage;
+
+ /** The Security page */
+ private SecurityPage securityPage;
+
+ /** The Tuning page */
+ private TuningPage tuningPage;
/**
@@ -271,6 +279,16 @@ public class OpenLDAPServerConfiguration
frontendPage.doSave( monitor );
}
+ if ( securityPage != null )
+ {
+ securityPage.doSave( monitor );
+ }
+
+ if ( tuningPage != null )
+ {
+ tuningPage.doSave( monitor );
+ }
+
if ( configPage != null )
{
configPage.doSave( monitor );
@@ -352,6 +370,8 @@ public class OpenLDAPServerConfiguration
optionsPage.refreshUI();
databasesPage.refreshUI();
frontendPage.refreshUI();
+ securityPage.refreshUI();
+ tuningPage.refreshUI();
configPage.refreshUI();
}
@@ -403,6 +423,12 @@ public class OpenLDAPServerConfiguration
databasesPage = new DatabasesPage( this );
addPage( databasesPage );
+ securityPage = new SecurityPage( this );
+ addPage( securityPage );
+
+ tuningPage = new TuningPage( this );
+ addPage( tuningPage );
+
optionsPage = new OptionsPage( this );
addPage( optionsPage );
}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.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/AbstractDatabaseSpecificDetailsBlock.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/databases/AbstractDatabaseSpecificDetailsBlock.java Fri May 22 15:51:37 2015
@@ -20,8 +20,8 @@
package org.apache.directory.studio.openldap.config.editor.databases;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.eclipse.swt.events.ModifyEvent;
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=1681156&r1=1681155&r2=1681156&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 May 22 15:51:37 2015
@@ -25,10 +25,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.CommonUIUtils;
+import org.apache.directory.studio.common.ui.widgets.AbstractWidget;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.BrowserWidget;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.openldap.common.ui.widgets.BooleanWithDefaultWidget;
@@ -39,6 +39,7 @@ import org.apache.directory.studio.openl
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
import org.apache.directory.studio.openldap.config.editor.dialogs.OverlayDialog;
import org.apache.directory.studio.openldap.config.editor.dialogs.ReplicationConsumerDialog;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapper;
import org.apache.directory.studio.openldap.config.model.OlcOverlayConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcBdbConfig;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
@@ -1735,7 +1736,7 @@ public class DatabasesDetailsPage implem
* @param listener
* the listener
*/
- protected void addModifyListener( BrowserWidget widget, WidgetModifyListener listener )
+ protected void addModifyListener( AbstractWidget widget, WidgetModifyListener listener )
{
if ( ( widget != null ) && ( listener != null ) )
{
@@ -1820,7 +1821,7 @@ public class DatabasesDetailsPage implem
* @param listener
* the listener
*/
- protected void removeModifyListener( BrowserWidget widget, WidgetModifyListener listener )
+ protected void removeModifyListener( AbstractWidget widget, WidgetModifyListener listener )
{
if ( ( widget != null ) && ( listener != null ) )
{
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=1681156&r1=1681155&r2=1681156&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 Fri May 22 15:51:37 2015
@@ -29,6 +29,9 @@ import org.apache.directory.studio.commo
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginUtils;
import org.apache.directory.studio.openldap.config.editor.OpenLDAPServerConfigurationEditor;
import org.apache.directory.studio.openldap.config.editor.pages.DatabasesPage;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperLabelProvider;
+import org.apache.directory.studio.openldap.config.editor.wrappers.DatabaseWrapperViewerSorter;
import org.apache.directory.studio.openldap.config.model.database.OlcDatabaseConfig;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ReplicationConsumerDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ReplicationConsumerDialog.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ReplicationConsumerDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ReplicationConsumerDialog.java Fri May 22 15:51:37 2015
@@ -29,8 +29,8 @@ import org.apache.directory.api.ldap.mod
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.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.EntryWidget;
import org.apache.directory.studio.ldapbrowser.common.widgets.search.FilterWidget;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -67,7 +67,6 @@ import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
import org.eclipse.swt.widgets.Text;
-
import org.apache.directory.studio.openldap.common.ui.dialogs.AttributeDialog;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPluginConstants;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ServerIdDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ServerIdDialog.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ServerIdDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ServerIdDialog.java Fri May 22 15:51:37 2015
@@ -40,16 +40,16 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.apache.directory.studio.openldap.config.editor.pages.ServerIdWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.ServerIdWrapper;
/**
- * The ServerIdDialog is used to edit a ServerID, which can be an integer, an hexadicimal number,
+ * The ServerIdDialog is used to edit a ServerID, which can be an integer, an hexadecimal number,
* optionally followed by an URL. The dialog overlay is like :
*
* <pre>
* +---------------------------------------+
- * | ServerID |
+ * | ServerID Input |
* | .-----------------------------------. |
* | | ID : [ ] | |
* | | URL : [ ] | |
@@ -83,7 +83,7 @@ public class ServerIdDialog extends Dial
/** The URL text */
private Text urlText;
- /** The resulting sevrerID Text, or an error message */
+ /** The resulting serverID Text, or an error message */
private Text serverIdText;
@@ -122,7 +122,7 @@ public class ServerIdDialog extends Dial
/**
- * The A listener for the ID Text
+ * The listener for the ID Text
*/
private ModifyListener idTextListener = new ModifyListener()
{
@@ -183,7 +183,7 @@ public class ServerIdDialog extends Dial
/**
- * The A listener for the URL Text
+ * The listener for the URL Text
*/
private ModifyListener urlTextListener = new ModifyListener()
{
@@ -284,7 +284,7 @@ public class ServerIdDialog extends Dial
* where one can insert the ServerID values:
*
* <pre>
- * ServerID
+ * ServerID Input
* .-----------------------------------.
* | ID : [ ] |
* | URL : [ ] |
@@ -294,10 +294,10 @@ public class ServerIdDialog extends Dial
*/
private void createServerIdEditGroup( Composite parent )
{
- // Attributes Group
+ // ServerID Group
Group serverIdGroup = BaseWidgetUtils.createGroup( parent, "ServerID input", 1 );
- GridLayout attributesGroupGridLayout = new GridLayout( 2, false );
- serverIdGroup.setLayout( attributesGroupGridLayout );
+ GridLayout serverIdGroupGridLayout = new GridLayout( 2, false );
+ serverIdGroup.setLayout( serverIdGroupGridLayout );
serverIdGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// ServerID Text
@@ -328,10 +328,10 @@ public class ServerIdDialog extends Dial
*/
private void createServerIdShowGroup( Composite parent )
{
- // Attributes Group
+ // ServerId Group
Group serverIdGroup = BaseWidgetUtils.createGroup( parent, "", 1 );
- GridLayout attributesGroupGridLayout = new GridLayout( 2, false );
- serverIdGroup.setLayout( attributesGroupGridLayout );
+ GridLayout serverIdGroupGridLayout = new GridLayout( 2, false );
+ serverIdGroup.setLayout( serverIdGroupGridLayout );
serverIdGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
// ServerID Text
Added: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/TcpBufferDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/TcpBufferDialog.java?rev=1681156&view=auto
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/TcpBufferDialog.java (added)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/TcpBufferDialog.java Fri May 22 15:51:37 2015
@@ -0,0 +1,507 @@
+/*
+ * 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.dialogs;
+
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.directory.studio.common.ui.AddEditDialog;
+import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.apache.directory.studio.openldap.config.editor.wrappers.TcpBufferWrapper;
+import org.apache.directory.studio.openldap.config.editor.wrappers.TcpBufferWrapper.TcpType;
+
+
+/**
+ * The TcpBufferDialog is used to edit a TcpBuffer, which can contain an URL and a type of TCP buffer,
+ * plus the size.<br/>
+ * The dialog overlay is like :
+ *
+ * <pre>
+ * +---------------------------------------+
+ * | TcpBuffer |
+ * | .-----------------------------------. |
+ * | | Size : [ ] () read () write | |
+ * | | URL : [ ] | |
+ * | '-----------------------------------' |
+ * | .-----------------------------------. |
+ * | | TcpBuffer : <///////////////////> | |
+ * | '-----------------------------------' |
+ * | |
+ * | (cancel) (OK) |
+ * +---------------------------------------+
+ *
+ * </pre>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class TcpBufferDialog extends AddEditDialog<TcpBufferWrapper>
+{
+ /** The list of existing TcpBuffer */
+ List<TcpBufferWrapper> tcpBufferList;
+
+ // UI widgets
+ /** The Size Text */
+ private Text sizeText;
+
+ /** The Read and Write checkboxes */
+ private Button readCheckbox;
+ private Button writeCheckbox;
+
+ /** The Listener text */
+ private Text listenerText;
+
+ /** The resulting TcpBuffer Text, or an error message */
+ private Text tcpBufferText;
+
+
+ /**
+ * Create a new instance of the TcpBufferDialog
+ *
+ * @param parentShell The parent Shell
+ */
+ public TcpBufferDialog( Shell parentShell )
+ {
+ super( parentShell );
+ super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
+ }
+
+
+ /**
+ * Create a new instance of the TcpBufferDialog
+ *
+ * @param parentShell The parent Shell
+ * @param tcpBuffer The instance containing the TcpServer data
+ */
+ public TcpBufferDialog( Shell parentShell, List<TcpBufferWrapper> tcpBufferList, TcpBufferWrapper tcpBuffer )
+ {
+ super( parentShell );
+ super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
+ setEditedElement( tcpBuffer );
+ this.tcpBufferList = tcpBufferList;
+
+ if ( tcpBufferList == null )
+ {
+ this.tcpBufferList = new ArrayList<TcpBufferWrapper>();
+ }
+ }
+
+
+ /**
+ * Create a new instance of the TcpBufferDialog
+ *
+ * @param parentShell The parent Shell
+ * @param tcpBufferStr : The string containing the tcpBuffer
+ */
+ public TcpBufferDialog( Shell parentShell, String tcpBufferStr )
+ {
+ super( parentShell );
+ super.setShellStyle( super.getShellStyle() | SWT.RESIZE );
+ setEditedElement( new TcpBufferWrapper( tcpBufferStr ) );
+ }
+
+
+ /**
+ * The listener for the size Text
+ */
+ private ModifyListener idTextListener = new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ Display display = tcpBufferText.getDisplay();
+ Button okButton = getButton( IDialogConstants.OK_ID );
+
+ // This button might be null when the dialog is called.
+ if ( okButton == null )
+ {
+ return;
+ }
+
+ try
+ {
+ int sizeValue = Integer.parseInt( sizeText.getText() );
+
+ // The size must be between 0 and 65535
+ if ( ( sizeValue < 0 ) || ( sizeValue > 65535 ) )
+ {
+ sizeText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ return;
+ }
+
+ sizeText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ getNewElement().setSize( sizeValue );
+ tcpBufferText.setText( getNewElement().toString() );
+
+ if ( TcpBufferWrapper.isValid( sizeText.getText(), listenerText.getText() ) )
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ okButton.setEnabled( true );
+ }
+ else
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ }
+ }
+ catch ( NumberFormatException nfe )
+ {
+ // Not even a number
+ sizeText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ tcpBufferText.setText( getNewElement().toString() );
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ }
+ }
+ };
+
+
+ /**
+ * The listener for the URL Text
+ */
+ private ModifyListener urlTextListener = new ModifyListener()
+ {
+ public void modifyText( ModifyEvent e )
+ {
+ Display display = tcpBufferText.getDisplay();
+ Button okButton = getButton( IDialogConstants.OK_ID );
+
+
+ // This button might be null when the dialog is called.
+ if ( okButton == null )
+ {
+ return;
+ }
+
+ try
+ {
+ URL newUrl = new URL( listenerText.getText() );
+
+ getNewElement().setListener( newUrl );
+ listenerText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ tcpBufferText.setText( getNewElement().toString() );
+
+ if ( TcpBufferWrapper.isValid( sizeText.getText(), listenerText.getText() ) )
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ okButton.setEnabled( true );
+ }
+ else
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ }
+ }
+ catch ( MalformedURLException mue )
+ {
+ listenerText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ tcpBufferText.setText( getNewElement().toString() );
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ }
+ }
+ };
+
+
+ /**
+ * The listener in charge of exposing the changes when the read or write buttons are checked
+ */
+ private SelectionListener checkboxSelectionListener = new SelectionAdapter()
+ {
+ public void widgetSelected( SelectionEvent e )
+ {
+ Display display = tcpBufferText.getDisplay();
+ Button okButton = getButton( IDialogConstants.OK_ID );
+
+ if ( readCheckbox.getSelection() )
+ {
+ if ( writeCheckbox.getSelection())
+ {
+ getNewElement().setTcpType( TcpType.BOTH );
+ }
+ else
+ {
+ getNewElement().setTcpType( TcpType.READ );
+ }
+ }
+ else if ( writeCheckbox.getSelection() )
+ {
+ if ( readCheckbox.getSelection() )
+ {
+ getNewElement().setTcpType( TcpType.BOTH );
+ }
+ else
+ {
+ getNewElement().setTcpType( TcpType.WRITE );
+ }
+ }
+ else
+ {
+ getNewElement().setTcpType( TcpType.BOTH );
+ }
+
+ // Set the TcpBuffer into the text box
+ tcpBufferText.setText( getNewElement().toString() );
+
+ if ( TcpBufferWrapper.isValid( sizeText.getText(), listenerText.getText() ) )
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_BLACK ) );
+ okButton.setEnabled( true );
+ }
+ else
+ {
+ tcpBufferText.setForeground( display.getSystemColor( SWT.COLOR_RED ) );
+ okButton.setEnabled( false );
+ }
+ }
+ };
+
+
+ /**
+ * @see org.eclipse.jface.window.Window#configureShell(org.eclipse.swt.widgets.Shell)
+ */
+ protected void configureShell( Shell shell )
+ {
+ super.configureShell( shell );
+ shell.setText( "TcpBuffer" );
+ }
+
+
+ /**
+ * We have to check that the ID does not already exist.
+ * {@inheritDoc}
+ */
+ protected void okPressed()
+ {
+ // Creating the new index
+ String sizeStr = sizeText.getText();
+ String url = listenerText.getText();
+ int sizeValue = Integer.valueOf( sizeStr );
+
+ boolean read = readCheckbox.getSelection();
+ boolean write = writeCheckbox.getSelection();
+ TcpType tcpType = null;
+
+ if ( read && !write )
+ {
+ tcpType = TcpType.READ;
+ }
+ else if ( !read && write )
+ {
+ tcpType = TcpType.WRITE;
+ }
+
+ setNewElement( new TcpBufferWrapper( sizeValue , tcpType, url ) );
+ super.okPressed();
+ }
+
+
+ /**
+ * Create the Dialog for TcpBuffer :
+ * <pre>
+ * +---------------------------------------+
+ * | TcpBuffer |
+ * | .-----------------------------------. |
+ * | | Size : [ ] () read () write | |
+ * | | URL : [ ] | |
+ * | '-----------------------------------' |
+ * | .-----------------------------------. |
+ * | | TcpBuffer : <///////////////////> | |
+ * | '-----------------------------------' |
+ * | |
+ * | (cancel) (OK) |
+ * +---------------------------------------+
+ * </pre>
+ * @see org.eclipse.jface.dialogs.Dialog#createDialogArea(org.eclipse.swt.widgets.Composite)
+ */
+ protected Control createDialogArea( Composite parent )
+ {
+ Composite composite = ( Composite ) super.createDialogArea( parent );
+ GridData gd = new GridData( GridData.FILL_BOTH );
+ composite.setLayoutData( gd );
+
+ createTcpBufferEditGroup( composite );
+ createTcpBufferShowGroup( composite );
+
+ initFromTcpBuffer();
+ addListeners();
+
+ applyDialogFont( composite );
+
+ return composite;
+ }
+
+
+ /**
+ * Creates the TcpBuffer input group. This is the part of the dialog
+ * where one can insert the TcpBuffer size and URL
+ *
+ * <pre>
+ * TcpBuffer Input
+ * .-----------------------------------.
+ * | Size : [ ] () read () write |
+ * | URL : [ ] |
+ * '-----------------------------------'
+ * </pre>
+ * @param parent the parent composite
+ */
+ private void createTcpBufferEditGroup( Composite parent )
+ {
+ // TcpBuffer Group
+ Group tcpBufferGroup = BaseWidgetUtils.createGroup( parent, "TcpBuffer input", 1 );
+ GridLayout attributesGroupGridLayout = new GridLayout( 6, false );
+ tcpBufferGroup.setLayout( attributesGroupGridLayout );
+ tcpBufferGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // Size Text
+ BaseWidgetUtils.createLabel( tcpBufferGroup, "Size :", 1 );
+ sizeText = BaseWidgetUtils.createText( tcpBufferGroup, "", 1 );
+ sizeText.addModifyListener( idTextListener );
+
+ // Read checkbox Button
+ readCheckbox = BaseWidgetUtils.createCheckbox( tcpBufferGroup, "read", 2 );
+
+ // Write checkbox Button
+ writeCheckbox = BaseWidgetUtils.createCheckbox( tcpBufferGroup, "write", 2 );
+
+ // URL Text
+ BaseWidgetUtils.createLabel( tcpBufferGroup, "URL:", 1 );
+ listenerText = BaseWidgetUtils.createText( tcpBufferGroup, "", 5 );
+ listenerText.addModifyListener( urlTextListener );
+ }
+
+
+ /**
+ * Creates the TcpBuffer show group. This is the part of the dialog
+ * where the real TcpBuffer is shown, or an error message if the TcpBuffer
+ * is invalid.
+ *
+ * <pre>
+ * .-----------------------------------.
+ * | TcpBuffer : <///////////////////> |
+ * '-----------------------------------'
+ * </pre>
+ * @param parent the parent composite
+ */
+ private void createTcpBufferShowGroup( Composite parent )
+ {
+ // TcpBuffer Group
+ Group tcpBufferGroup = BaseWidgetUtils.createGroup( parent, "", 1 );
+ GridLayout tcpBufferGroupGridLayout = new GridLayout( 2, false );
+ tcpBufferGroup.setLayout( tcpBufferGroupGridLayout );
+ tcpBufferGroup.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+
+ // TcpBuffer Text
+ tcpBufferText = BaseWidgetUtils.createText( tcpBufferGroup, "", 1 );
+ tcpBufferText.setLayoutData( new GridData( SWT.FILL, SWT.NONE, true, false ) );
+ tcpBufferText.setEditable( false );
+ }
+
+
+ /**
+ * Initializes the UI from the TcpBuffer
+ */
+ private void initFromTcpBuffer()
+ {
+ if ( getEditedElement() != null )
+ {
+ sizeText.setText( Integer.toString( getEditedElement().getSize() ) );
+
+ URL listener = getEditedElement().getListener();
+
+ if ( listener == null )
+ {
+ listenerText.setText( "" );
+ }
+ else
+ {
+ listenerText.setText( listener.toString() );
+ }
+
+ tcpBufferText.setText( getEditedElement().toString() );
+ }
+ }
+
+
+ /**
+ * @return the tcpBufferList
+ */
+ public List<TcpBufferWrapper> getTcpBufferList()
+ {
+ return tcpBufferList;
+ }
+
+
+ /**
+ * @param tcpBufferList the tcpBufferList to set
+ */
+ public void setTcpBufferList( List<TcpBufferWrapper> tcpBufferList )
+ {
+ this.tcpBufferList = tcpBufferList;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void setEditedElement( String editedElement )
+ {
+ setEditedElement( new TcpBufferWrapper( editedElement ) );
+ }
+
+
+ /**
+ * Add a new Element that will be edited
+ */
+ public void addNewElement()
+ {
+ setNewElement( new TcpBufferWrapper( "" ) );
+ }
+
+
+ /**
+ * Adds listeners.
+ */
+ private void addListeners()
+ {
+ readCheckbox.addSelectionListener( checkboxSelectionListener );
+ writeCheckbox.addSelectionListener( checkboxSelectionListener );
+ }
+
+}
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ValueSortingValueDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ValueSortingValueDialog.java?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ValueSortingValueDialog.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/dialogs/ValueSortingValueDialog.java Fri May 22 15:51:37 2015
@@ -30,8 +30,8 @@ import java.util.List;
import org.apache.directory.api.ldap.model.name.Dn;
import org.apache.directory.api.ldap.model.schema.AttributeType;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
-import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.widgets.WidgetModifyListener;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogConstants;
Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.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?rev=1681156&r1=1681155&r2=1681156&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/pages/OpenLDAPServerConfigurationEditorPage.java Fri May 22 15:51:37 2015
@@ -20,8 +20,8 @@
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.common.ui.widgets.WidgetModifyEvent;
+import org.apache.directory.studio.common.ui.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;
@@ -69,7 +69,7 @@ public abstract class OpenLDAPServerConf
/**
* A listener used to set the dirty flag when a Text is updated
*/
- private ModifyListener dirtyModifyListener = new ModifyListener()
+ protected ModifyListener dirtyModifyListener = new ModifyListener()
{
public void modifyText( ModifyEvent e )
{