Author: seelmann
Date: Wed Feb 27 14:09:58 2008
New Revision: 631751
URL: http://svn.apache.org/viewvc?rev=631751&view=rev
Log:
Fix for DIRSTUDIO-270 (Copy and paste does not work when value being edited): Changed the way how global action handlers are deactivated and reactivated when editing a value
Modified:
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserViewActionProxy.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java
directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/ModificationLogsViewActionProxy.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/SearchResultEditorActionProxy.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEditorAction.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java
directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java Wed Feb 27 14:09:58 2008
@@ -48,20 +48,15 @@
SearchUpdateListener, BookmarkUpdateListener, ConnectionUpdateListener
{
- /** The action handler manager, used to deactivate and activate the action handlers and key bindings. */
- private ActionHandlerManager actionHandlerManager;
-
protected BrowserAction action;
protected ISelectionProvider selectionProvider;
- protected BrowserActionProxy( ISelectionProvider selectionProvider, ActionHandlerManager actionHandlerManager,
- BrowserAction action, int style )
+ protected BrowserActionProxy( ISelectionProvider selectionProvider, BrowserAction action, int style )
{
super( action.getText(), style );
this.selectionProvider = selectionProvider;
- this.actionHandlerManager = actionHandlerManager;
this.action = action;
super.setImageDescriptor( action.getImageDescriptor() );
@@ -79,10 +74,9 @@
}
- protected BrowserActionProxy( ISelectionProvider selectionProvider, ActionHandlerManager actionHandlerManager,
- BrowserAction action )
+ protected BrowserActionProxy( ISelectionProvider selectionProvider, BrowserAction action )
{
- this( selectionProvider, actionHandlerManager, action, Action.AS_PUSH_BUTTON );
+ this( selectionProvider, action, Action.AS_PUSH_BUTTON );
}
@@ -244,19 +238,7 @@
{
if ( !isDisposed() )
{
- // deactivate global actions
- if ( actionHandlerManager != null )
- {
- actionHandlerManager.deactivateGlobalActionHandlers();
- }
-
action.run();
-
- // activate global actions
- if ( actionHandlerManager != null )
- {
- actionHandlerManager.activateGlobalActionHandlers();
- }
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserViewActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserViewActionProxy.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserViewActionProxy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserViewActionProxy.java Wed Feb 27 14:09:58 2008
@@ -38,13 +38,11 @@
* Creates a new instance of BrowserViewActionProxy.
*
* @param viewer the viewer
- * @param actionHandlerManager the action handler manager,
- * used to deactivate and activate the action handlers and key bindings
* @param action the real action
*/
- public BrowserViewActionProxy( Viewer viewer, ActionHandlerManager actionHandlerManager, BrowserAction action )
+ public BrowserViewActionProxy( Viewer viewer, BrowserAction action )
{
- super( viewer, actionHandlerManager, action );
+ super( viewer, action );
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/EntryEditorActionProxy.java Wed Feb 27 14:09:58 2008
@@ -39,13 +39,11 @@
* Creates a new instance of EntryEditorActionProxy.
*
* @param viewer the viewer
- * @param actionHandlerManager the action handler manager,
- * used to deactivate and activate the action handlers and key bindings
* @param action the real action
*/
- public EntryEditorActionProxy( Viewer viewer, ActionHandlerManager actionHandlerManager, BrowserAction action )
+ public EntryEditorActionProxy( Viewer viewer, BrowserAction action )
{
- super( viewer, actionHandlerManager, action );
+ super( viewer, action );
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserActionGroup.java Wed Feb 27 14:09:58 2008
@@ -102,13 +102,12 @@
openSortDialogAction = new OpenSortDialogAction( ( BrowserPreferences ) configuration.getPreferences() );
collapseAllAction = new CollapseAllAction( viewer );
- browserActionMap.put( upAction, new BrowserViewActionProxy( viewer, this, new UpAction( viewer ) ) );
- browserActionMap.put( refreshAction, new BrowserViewActionProxy( viewer, this, new RefreshAction() ) );
- browserActionMap.put( filterChildrenAction, new BrowserViewActionProxy( viewer, this,
- new FilterChildrenAction() ) );
- browserActionMap.put( unfilterChildrenAction, new BrowserViewActionProxy( viewer, this,
- new UnfilterChildrenAction() ) );
- browserActionMap.put( propertyDialogAction, new BrowserViewActionProxy( viewer, this, new PropertiesAction() ) );
+ browserActionMap.put( upAction, new BrowserViewActionProxy( viewer, new UpAction( viewer ) ) );
+ browserActionMap.put( refreshAction, new BrowserViewActionProxy( viewer, new RefreshAction() ) );
+ browserActionMap.put( filterChildrenAction, new BrowserViewActionProxy( viewer, new FilterChildrenAction() ) );
+ browserActionMap
+ .put( unfilterChildrenAction, new BrowserViewActionProxy( viewer, new UnfilterChildrenAction() ) );
+ browserActionMap.put( propertyDialogAction, new BrowserViewActionProxy( viewer, new PropertiesAction() ) );
}
@@ -125,10 +124,10 @@
collapseAllAction.dispose();
collapseAllAction = null;
- for ( Iterator it = browserActionMap.keySet().iterator(); it.hasNext(); )
+ for ( Iterator<String> it = browserActionMap.keySet().iterator(); it.hasNext(); )
{
String key = ( String ) it.next();
- BrowserViewActionProxy action = ( BrowserViewActionProxy ) browserActionMap.get( key );
+ BrowserViewActionProxy action = browserActionMap.get( key );
action.dispose();
action = null;
it.remove();
@@ -302,9 +301,8 @@
*/
public void setInput( IBrowserConnection connection )
{
- for ( Iterator it = browserActionMap.values().iterator(); it.hasNext(); )
+ for ( BrowserViewActionProxy action : browserActionMap.values() )
{
- BrowserViewActionProxy action = ( BrowserViewActionProxy ) it.next();
action.inputChanged( connection );
}
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/AbstractOpenEditorAction.java Wed Feb 27 14:09:58 2008
@@ -51,6 +51,9 @@
/** The cell editor. */
protected CellEditor cellEditor;
+ /** The actionGroup. */
+ protected EntryEditorWidgetActionGroup actionGroup;
+
/**
* Creates a new instance of AbstractOpenEditorAction.
@@ -58,10 +61,12 @@
* @param viewer the viewer
* @param valueEditorManager the value editor manager
*/
- protected AbstractOpenEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager )
+ protected AbstractOpenEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager,
+ EntryEditorWidgetActionGroup actionGroup )
{
this.viewer = viewer;
this.valueEditorManager = valueEditorManager;
+ this.actionGroup = actionGroup;
}
@@ -109,6 +114,8 @@
&& viewer.getCellModifier().canModify( getSelectedValues()[0],
EntryEditorWidgetTableMetadata.VALUE_COLUMN_NAME ) )
{
+ // disable action handlers
+ actionGroup.deactivateGlobalActionHandlers();
// set cell editor to viewer
viewer.getCellEditors()[EntryEditorWidgetTableMetadata.VALUE_COLUMN_INDEX] = cellEditor;
@@ -158,6 +165,9 @@
// openeditoractions to update their enabled state.
valueEditorManager.setUserSelectedValueEditor( null );
viewer.setSelection( viewer.getSelection() );
+
+ // enable action handlers
+ actionGroup.activateGlobalActionHandlers();
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EditAttributeDescriptionAction.java Wed Feb 27 14:09:58 2008
@@ -55,7 +55,7 @@
*/
public EditAttributeDescriptionAction( Viewer viewer )
{
- deleteActionProxy = new EntryEditorActionProxy( viewer, null, new DeleteAction() );
+ deleteActionProxy = new EntryEditorActionProxy( viewer, new DeleteAction() );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroup.java Wed Feb 27 14:09:58 2008
@@ -127,30 +127,28 @@
showRawValuesAction = new ShowRawValuesAction();
showQuickFilterAction = new ShowQuickFilterAction( mainWidget.getQuickFilterWidget() );
- openBestValueEditorActionProxy = new EntryEditorActionProxy( viewer, this, new OpenBestEditorAction( viewer,
- configuration.getValueEditorManager( viewer ) ) );
- openDefaultValueEditorActionProxy = new EntryEditorActionProxy( viewer, this, new OpenDefaultEditorAction(
- viewer, openBestValueEditorActionProxy, false ) );
+ openBestValueEditorActionProxy = new EntryEditorActionProxy( viewer, new OpenBestEditorAction( viewer,
+ configuration.getValueEditorManager( viewer ), this ) );
+ openDefaultValueEditorActionProxy = new EntryEditorActionProxy( viewer, new OpenDefaultEditorAction( viewer,
+ openBestValueEditorActionProxy, false ) );
IValueEditor[] valueEditors = configuration.getValueEditorManager( viewer ).getAllValueEditors();
openValueEditorActionProxies = new EntryEditorActionProxy[valueEditors.length];
for ( int i = 0; i < openValueEditorActionProxies.length; i++ )
{
- openValueEditorActionProxies[i] = new EntryEditorActionProxy( viewer, this, new OpenEditorAction( viewer,
- configuration.getValueEditorManager( viewer ), valueEditors[i] ) );
+ openValueEditorActionProxies[i] = new EntryEditorActionProxy( viewer, new OpenEditorAction( viewer,
+ configuration.getValueEditorManager( viewer ), valueEditors[i], this ) );
}
openValueEditorPreferencesAction = new ValueEditorPreferencesAction();
- entryEditorActionMap.put( newValueAction, new EntryEditorActionProxy( viewer, this, new NewValueAction() ) );
+ entryEditorActionMap.put( newValueAction, new EntryEditorActionProxy( viewer, new NewValueAction() ) );
- entryEditorActionMap.put( pasteAction, new EntryEditorActionProxy( viewer, this, new PasteAction() ) );
- entryEditorActionMap.put( copyAction, new EntryEditorActionProxy( viewer, this, new CopyAction(
+ entryEditorActionMap.put( pasteAction, new EntryEditorActionProxy( viewer, new PasteAction() ) );
+ entryEditorActionMap.put( copyAction, new EntryEditorActionProxy( viewer, new CopyAction(
( BrowserActionProxy ) entryEditorActionMap.get( pasteAction ) ) ) );
- entryEditorActionMap.put( deleteAction, new EntryEditorActionProxy( viewer, this, new DeleteAction() ) );
- entryEditorActionMap.put( selectAllAction, new EntryEditorActionProxy( viewer, this, new SelectAllAction(
- viewer ) ) );
+ entryEditorActionMap.put( deleteAction, new EntryEditorActionProxy( viewer, new DeleteAction() ) );
+ entryEditorActionMap.put( selectAllAction, new EntryEditorActionProxy( viewer, new SelectAllAction( viewer ) ) );
- entryEditorActionMap.put( propertyDialogAction, new EntryEditorActionProxy( viewer, this,
- new PropertiesAction() ) );
+ entryEditorActionMap.put( propertyDialogAction, new EntryEditorActionProxy( viewer, new PropertiesAction() ) );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/EntryEditorWidgetActionGroupWithAttribute.java Wed Feb 27 14:09:58 2008
@@ -67,11 +67,10 @@
super( mainWidget, configuration );
TreeViewer viewer = mainWidget.getViewer();
- entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer,
new EditAttributeDescriptionAction( viewer ) ) );
- entryEditorActionMap.put( newAttributeAction, new EntryEditorActionProxy( viewer, this,
- new NewAttributeAction() ) );
- entryEditorActionMap.put( deleteAllValuesAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( newAttributeAction, new EntryEditorActionProxy( viewer, new NewAttributeAction() ) );
+ entryEditorActionMap.put( deleteAllValuesAction, new EntryEditorActionProxy( viewer,
new DeleteAllValuesAction() ) );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenBestEditorAction.java Wed Feb 27 14:09:58 2008
@@ -45,10 +45,12 @@
*
* @param viewer the viewer
* @param valueEditorManager the value editor manager
+ * @param actionGroup the action group
*/
- public OpenBestEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager )
+ public OpenBestEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager,
+ EntryEditorWidgetActionGroup actionGroup )
{
- super( viewer, valueEditorManager );
+ super( viewer, valueEditorManager, actionGroup );
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenDefaultEditorAction.java Wed Feb 27 14:09:58 2008
@@ -58,7 +58,7 @@
boolean enableRenameAction )
{
this.bestValueEditorProxy = bestValueEditorProxy;
- this.renameProxy = enableRenameAction ? new EntryEditorActionProxy( viewer, null, new RenameAction() ) : null;
+ this.renameProxy = enableRenameAction ? new EntryEditorActionProxy( viewer, new RenameAction() ) : null;
}
Modified: directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/entryeditor/OpenEditorAction.java Wed Feb 27 14:09:58 2008
@@ -48,10 +48,12 @@
* @param viewer the viewer
* @param valueEditorManager the value editor manager
* @param valueEditor the specific value editor
+ * @param actionGroup the action group
*/
- public OpenEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager, IValueEditor valueEditor )
+ public OpenEditorAction( TreeViewer viewer, ValueEditorManager valueEditorManager, IValueEditor valueEditor,
+ EntryEditorWidgetActionGroup actionGroup )
{
- super( viewer, valueEditorManager );
+ super( viewer, valueEditorManager, actionGroup );
super.cellEditor = valueEditor.getCellEditor();
this.valueEditor = valueEditor;
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/ModificationLogsViewActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/ModificationLogsViewActionProxy.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/ModificationLogsViewActionProxy.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/ModificationLogsViewActionProxy.java Wed Feb 27 14:09:58 2008
@@ -22,7 +22,6 @@
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
-import org.apache.directory.studio.ldapbrowser.common.actions.proxy.ActionHandlerManager;
import org.apache.directory.studio.ldapbrowser.common.actions.proxy.BrowserActionProxy;
import org.eclipse.jface.viewers.Viewer;
@@ -40,14 +39,11 @@
* Creates a new instance of ModificationLogsViewActionProxy.
*
* @param viewer the viewer
- * @param actionHandlerManager the action handler manager,
- * used to deactivate and activate the action handlers and key bindings
* @param action the real action
*/
- public ModificationLogsViewActionProxy( Viewer viewer, ActionHandlerManager actionHandlerManager,
- BrowserAction action )
+ public ModificationLogsViewActionProxy( Viewer viewer, BrowserAction action )
{
- super( viewer, actionHandlerManager, action );
+ super( viewer, action );
}
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/SearchResultEditorActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/SearchResultEditorActionProxy.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/SearchResultEditorActionProxy.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/proxy/SearchResultEditorActionProxy.java Wed Feb 27 14:09:58 2008
@@ -22,7 +22,6 @@
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
-import org.apache.directory.studio.ldapbrowser.common.actions.proxy.ActionHandlerManager;
import org.apache.directory.studio.ldapbrowser.common.actions.proxy.BrowserActionProxy;
import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditorCursor;
@@ -40,14 +39,11 @@
* Creates a new instance of SearchResultEditorActionProxy.
*
* @param cursor the cursor
- * @param actionHandlerManager the action handler manager,
- * used to deactivate and activate the action handlers and key bindings
* @param action the real action
*/
- public SearchResultEditorActionProxy( SearchResultEditorCursor cursor, ActionHandlerManager actionHandlerManager,
- BrowserAction action )
+ public SearchResultEditorActionProxy( SearchResultEditorCursor cursor, BrowserAction action )
{
- super( cursor, actionHandlerManager, action );
+ super( cursor, action );
}
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorActionGroup.java Wed Feb 27 14:09:58 2008
@@ -163,64 +163,61 @@
// create OpenDefaultEditorAction with enabled rename action flag
openDefaultValueEditorActionProxy.dispose();
- openDefaultValueEditorActionProxy = new EntryEditorActionProxy( viewer, this, new OpenDefaultEditorAction(
- viewer, openBestValueEditorActionProxy, true ) );
+ openDefaultValueEditorActionProxy = new EntryEditorActionProxy( viewer, new OpenDefaultEditorAction( viewer,
+ openBestValueEditorActionProxy, true ) );
showOperationalAttributesAction = new ShowOperationalAttributesAction();
openEntryEditorPreferencePage = new OpenEntryEditorPreferencePageAction();
collapseAllAction = new CollapseAllAction( viewer );
expandAllAction = new ExpandAllAction( viewer );
- entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( editAttributeDescriptionAction, new EntryEditorActionProxy( viewer,
new EditAttributeDescriptionAction( viewer ) ) );
- entryEditorActionMap.put( refreshAttributesAction, new EntryEditorActionProxy( viewer, this,
- new RefreshAction() ) );
+ entryEditorActionMap.put( refreshAttributesAction, new EntryEditorActionProxy( viewer, new RefreshAction() ) );
- entryEditorActionMap.put( newAttributeAction, new EntryEditorActionProxy( viewer, this,
- new NewAttributeAction() ) );
- entryEditorActionMap.put( newSearchAction, new EntryEditorActionProxy( viewer, this, new NewSearchAction() ) );
- entryEditorActionMap.put( newBatchOperationAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( newAttributeAction, new EntryEditorActionProxy( viewer, new NewAttributeAction() ) );
+ entryEditorActionMap.put( newSearchAction, new EntryEditorActionProxy( viewer, new NewSearchAction() ) );
+ entryEditorActionMap.put( newBatchOperationAction, new EntryEditorActionProxy( viewer,
new NewBatchOperationAction() ) );
- entryEditorActionMap.put( locateDnInDitAction, new EntryEditorActionProxy( viewer, this,
- new LocateDnInDitAction() ) );
- entryEditorActionMap.put( showOcdAction, new EntryEditorActionProxy( viewer, this, new OpenSchemaBrowserAction(
+ entryEditorActionMap.put( locateDnInDitAction, new EntryEditorActionProxy( viewer, new LocateDnInDitAction() ) );
+ entryEditorActionMap.put( showOcdAction, new EntryEditorActionProxy( viewer, new OpenSchemaBrowserAction(
OpenSchemaBrowserAction.MODE_OBJECTCLASS ) ) );
- entryEditorActionMap.put( showAtdAction, new EntryEditorActionProxy( viewer, this, new OpenSchemaBrowserAction(
+ entryEditorActionMap.put( showAtdAction, new EntryEditorActionProxy( viewer, new OpenSchemaBrowserAction(
OpenSchemaBrowserAction.MODE_ATTRIBUTETYPE ) ) );
- entryEditorActionMap.put( showEqualityMrdAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( showEqualityMrdAction, new EntryEditorActionProxy( viewer,
new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_EQUALITYMATCHINGRULE ) ) );
- entryEditorActionMap.put( showSubstringMrdAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( showSubstringMrdAction, new EntryEditorActionProxy( viewer,
new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_SUBSTRINGMATCHINGRULE ) ) );
- entryEditorActionMap.put( showOrderingMrdAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( showOrderingMrdAction, new EntryEditorActionProxy( viewer,
new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_ORDERINGMATCHINGRULE ) ) );
- entryEditorActionMap.put( showLsdAction, new EntryEditorActionProxy( viewer, this, new OpenSchemaBrowserAction(
+ entryEditorActionMap.put( showLsdAction, new EntryEditorActionProxy( viewer, new OpenSchemaBrowserAction(
OpenSchemaBrowserAction.MODE_SYNTAX ) ) );
- entryEditorActionMap.put( copyDnAction, new EntryEditorActionProxy( viewer, this, new CopyDnAction() ) );
- entryEditorActionMap.put( copyUrlAction, new EntryEditorActionProxy( viewer, this, new CopyUrlAction() ) );
- entryEditorActionMap.put( copyAttriuteDescriptionAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( copyDnAction, new EntryEditorActionProxy( viewer, new CopyDnAction() ) );
+ entryEditorActionMap.put( copyUrlAction, new EntryEditorActionProxy( viewer, new CopyUrlAction() ) );
+ entryEditorActionMap.put( copyAttriuteDescriptionAction, new EntryEditorActionProxy( viewer,
new CopyAttributeDescriptionAction() ) );
- entryEditorActionMap.put( copyValueUtf8Action, new EntryEditorActionProxy( viewer, this, new CopyValueAction(
+ entryEditorActionMap.put( copyValueUtf8Action, new EntryEditorActionProxy( viewer, new CopyValueAction(
CopyValueAction.MODE_UTF8 ) ) );
- entryEditorActionMap.put( copyValueBase64Action, new EntryEditorActionProxy( viewer, this, new CopyValueAction(
+ entryEditorActionMap.put( copyValueBase64Action, new EntryEditorActionProxy( viewer, new CopyValueAction(
CopyValueAction.MODE_BASE64 ) ) );
- entryEditorActionMap.put( copyValueHexAction, new EntryEditorActionProxy( viewer, this, new CopyValueAction(
+ entryEditorActionMap.put( copyValueHexAction, new EntryEditorActionProxy( viewer, new CopyValueAction(
CopyValueAction.MODE_HEX ) ) );
- entryEditorActionMap.put( copyValueAsLdifAction, new EntryEditorActionProxy( viewer, this, new CopyValueAction(
+ entryEditorActionMap.put( copyValueAsLdifAction, new EntryEditorActionProxy( viewer, new CopyValueAction(
CopyValueAction.MODE_LDIF ) ) );
- entryEditorActionMap.put( copySearchFilterAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( copySearchFilterAction, new EntryEditorActionProxy( viewer,
new CopySearchFilterAction( CopySearchFilterAction.MODE_EQUALS ) ) );
- entryEditorActionMap.put( copyNotSearchFilterAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( copyNotSearchFilterAction, new EntryEditorActionProxy( viewer,
new CopySearchFilterAction( CopySearchFilterAction.MODE_NOT ) ) );
- entryEditorActionMap.put( copyAndSearchFilterAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( copyAndSearchFilterAction, new EntryEditorActionProxy( viewer,
new CopySearchFilterAction( CopySearchFilterAction.MODE_AND ) ) );
- entryEditorActionMap.put( copyOrSearchFilterAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( copyOrSearchFilterAction, new EntryEditorActionProxy( viewer,
new CopySearchFilterAction( CopySearchFilterAction.MODE_OR ) ) );
- entryEditorActionMap.put( deleteAllValuesAction, new EntryEditorActionProxy( viewer, this,
+ entryEditorActionMap.put( deleteAllValuesAction, new EntryEditorActionProxy( viewer,
new DeleteAllValuesAction() ) );
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/AbstractOpenEditorAction.java Wed Feb 27 14:09:58 2008
@@ -46,13 +46,17 @@
private boolean isActive;
+ /** The actionGroup. */
+ protected SearchResultEditorActionGroup actionGroup;
+
protected AbstractOpenEditorAction( TableViewer viewer, SearchResultEditorCursor cursor,
- ValueEditorManager valueEditorManager )
+ ValueEditorManager valueEditorManager, SearchResultEditorActionGroup actionGroup )
{
this.viewer = viewer;
this.cursor = cursor;
this.valueEditorManager = valueEditorManager;
+ this.actionGroup = actionGroup;
this.isActive = false;
}
@@ -90,6 +94,9 @@
* e) { } EventRegistry.resumeEventFireingInCurrentThread(); } }
*/
+ // disable action handlers
+ actionGroup.deactivateGlobalActionHandlers();
+
// set cell editor to viewer
for ( int i = 0; i < this.viewer.getCellEditors().length; i++ )
{
@@ -173,6 +180,8 @@
}
} );
+ // enable action handlers
+ actionGroup.activateGlobalActionHandlers();
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java Wed Feb 27 14:09:58 2008
@@ -34,9 +34,9 @@
public OpenBestEditorAction( TableViewer viewer, SearchResultEditorCursor cursor,
- ValueEditorManager valueEditorManager )
+ ValueEditorManager valueEditorManager, SearchResultEditorActionGroup actionGroup )
{
- super( viewer, cursor, valueEditorManager );
+ super( viewer, cursor, valueEditorManager, actionGroup );
}
@@ -50,7 +50,7 @@
return this.bestValueEditor;
}
-
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#dispose()
*/
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java Wed Feb 27 14:09:58 2008
@@ -35,9 +35,10 @@
public OpenDefaultEditorAction( TableViewer viewer, SearchResultEditorCursor cursor,
- ValueEditorManager valueEditorManager, SearchResultEditorActionProxy bestValueEditorProxy )
+ ValueEditorManager valueEditorManager, SearchResultEditorActionProxy bestValueEditorProxy,
+ SearchResultEditorActionGroup actionGroup )
{
- super( viewer, cursor, valueEditorManager );
+ super( viewer, cursor, valueEditorManager, actionGroup );
this.bestValueEditorProxy = bestValueEditorProxy;
}
@@ -55,7 +56,7 @@
super.dispose();
}
-
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#getCommandId()
*/
@@ -63,8 +64,8 @@
{
return BrowserCommonConstants.ACTION_ID_EDIT_VALUE;
}
-
-
+
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#getImageDescriptor()
*/
@@ -79,8 +80,8 @@
return null;
}
}
-
-
+
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#getText()
*/
@@ -88,9 +89,8 @@
{
return "Edit Value";
}
-
-
-
+
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#isEnabled()
*/
@@ -105,6 +105,5 @@
return false;
}
}
-
-
+
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEditorAction.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEditorAction.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEditorAction.java Wed Feb 27 14:09:58 2008
@@ -37,10 +37,9 @@
public OpenEditorAction( TableViewer viewer, SearchResultEditorCursor cursor,
- ValueEditorManager valueEditorManager,
- IValueEditor valueEditor )
+ ValueEditorManager valueEditorManager, IValueEditor valueEditor, SearchResultEditorActionGroup actionGroup )
{
- super( viewer, cursor, valueEditorManager );
+ super( viewer, cursor, valueEditorManager, actionGroup );
super.cellEditor = valueEditor.getCellEditor();
this.valueEditor = valueEditor;
}
@@ -58,7 +57,7 @@
super.run();
}
-
+
/**
* @see org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction#dispose()
*/
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java Wed Feb 27 14:09:58 2008
@@ -78,7 +78,7 @@
private OpenSearchResultEditorPreferencePage openSearchResultEditorPreferencePage;
private ShowQuickFilterAction showQuickFilterAction;
-
+
/** The open default editor action. */
private SearchResultEditorActionProxy openDefaultValueEditorActionProxy;
@@ -87,7 +87,6 @@
/** The open editor actions. */
private SearchResultEditorActionProxy[] openValueEditorActionProxies;
-
private ValueEditorPreferencesAction openValueEditorPreferencesAction;
@@ -170,83 +169,83 @@
this.showQuickFilterAction = new ShowQuickFilterAction( searchResultEditor.getMainWidget()
.getQuickFilterWidget() );
- openBestValueEditorActionProxy = new SearchResultEditorActionProxy( cursor, this, new OpenBestEditorAction(
- viewer, cursor, valueEditorManager ) );
- openDefaultValueEditorActionProxy = new SearchResultEditorActionProxy( cursor, this,
- new OpenDefaultEditorAction( viewer, cursor, valueEditorManager, openBestValueEditorActionProxy ) );
+ openBestValueEditorActionProxy = new SearchResultEditorActionProxy( cursor, new OpenBestEditorAction( viewer,
+ cursor, valueEditorManager, this ) );
+ openDefaultValueEditorActionProxy = new SearchResultEditorActionProxy( cursor, new OpenDefaultEditorAction(
+ viewer, cursor, valueEditorManager, openBestValueEditorActionProxy, this ) );
IValueEditor[] valueEditors = searchResultEditor.getConfiguration().getValueEditorManager( viewer )
.getAllValueEditors();
openValueEditorActionProxies = new SearchResultEditorActionProxy[valueEditors.length];
for ( int i = 0; i < openValueEditorActionProxies.length; i++ )
{
- openValueEditorActionProxies[i] = new SearchResultEditorActionProxy( cursor, this, new OpenEditorAction( viewer, cursor,
- valueEditorManager, valueEditors[i] ) );
- }
+ openValueEditorActionProxies[i] = new SearchResultEditorActionProxy( cursor, new OpenEditorAction( viewer,
+ cursor, valueEditorManager, valueEditors[i], this ) );
+ }
this.openValueEditorPreferencesAction = new ValueEditorPreferencesAction();
this.searchResultEditorActionMap.put( copyTableAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyEntryAsCsvAction( CopyEntryAsCsvAction.MODE_TABLE ) ) );
+ new CopyEntryAsCsvAction( CopyEntryAsCsvAction.MODE_TABLE ) ) );
this.searchResultEditorActionMap.put( refreshSearchAction, new SearchResultEditorActionProxy( cursor,
- this, new RefreshAction() ) );
+ new RefreshAction() ) );
this.searchResultEditorActionMap.put( newValueAction, new SearchResultEditorActionProxy( cursor,
- this, new NewValueAction() ) );
+ new NewValueAction() ) );
this.searchResultEditorActionMap.put( newSearchAction, new SearchResultEditorActionProxy( cursor,
- this, new NewSearchAction() ) );
+ new NewSearchAction() ) );
this.searchResultEditorActionMap.put( newBatchOperationAction, new SearchResultEditorActionProxy( cursor,
- this, new NewBatchOperationAction() ) );
+ new NewBatchOperationAction() ) );
this.searchResultEditorActionMap.put( locateDnInDitAction, new SearchResultEditorActionProxy( cursor,
- this, new LocateDnInDitAction() ) );
+ new LocateDnInDitAction() ) );
this.searchResultEditorActionMap.put( openSearchResultAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSearchResultAction() ) );
+ new OpenSearchResultAction() ) );
this.searchResultEditorActionMap.put( showOcdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_OBJECTCLASS ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_OBJECTCLASS ) ) );
this.searchResultEditorActionMap.put( showAtdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_ATTRIBUTETYPE ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_ATTRIBUTETYPE ) ) );
this.searchResultEditorActionMap.put( showEqualityMrdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_EQUALITYMATCHINGRULE ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_EQUALITYMATCHINGRULE ) ) );
this.searchResultEditorActionMap.put( showSubstringMrdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_SUBSTRINGMATCHINGRULE ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_SUBSTRINGMATCHINGRULE ) ) );
this.searchResultEditorActionMap.put( showOrderingMrdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_ORDERINGMATCHINGRULE ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_ORDERINGMATCHINGRULE ) ) );
this.searchResultEditorActionMap.put( showLsdAction, new SearchResultEditorActionProxy( cursor,
- this, new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_SYNTAX ) ) );
+ new OpenSchemaBrowserAction( OpenSchemaBrowserAction.MODE_SYNTAX ) ) );
this.searchResultEditorActionMap.put( pasteAction, new SearchResultEditorActionProxy( cursor,
- this, new SearchResultEditorPasteAction() ) );
- this.searchResultEditorActionMap.put( copyAction, new SearchResultEditorActionProxy( cursor, this, new CopyAction(
+ new SearchResultEditorPasteAction() ) );
+ this.searchResultEditorActionMap.put( copyAction, new SearchResultEditorActionProxy( cursor, new CopyAction(
( BrowserActionProxy ) this.searchResultEditorActionMap.get( pasteAction ) ) ) );
this.searchResultEditorActionMap.put( deleteAction, new SearchResultEditorActionProxy( cursor,
- this, new SearchResultDeleteAction() ) );
+ new SearchResultDeleteAction() ) );
this.searchResultEditorActionMap.put( copyDnAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyDnAction() ) );
+ new CopyDnAction() ) );
this.searchResultEditorActionMap.put( copyUrlAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyUrlAction() ) );
+ new CopyUrlAction() ) );
this.searchResultEditorActionMap.put( copyAttriuteDescriptionAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyAttributeDescriptionAction() ) );
+ new CopyAttributeDescriptionAction() ) );
this.searchResultEditorActionMap.put( copyValueUtf8Action, new SearchResultEditorActionProxy( cursor,
- this, new CopyValueAction( CopyValueAction.MODE_UTF8 ) ) );
+ new CopyValueAction( CopyValueAction.MODE_UTF8 ) ) );
this.searchResultEditorActionMap.put( copyValueBase64Action, new SearchResultEditorActionProxy( cursor,
- this, new CopyValueAction( CopyValueAction.MODE_BASE64 ) ) );
+ new CopyValueAction( CopyValueAction.MODE_BASE64 ) ) );
this.searchResultEditorActionMap.put( copyValueHexAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyValueAction( CopyValueAction.MODE_HEX ) ) );
+ new CopyValueAction( CopyValueAction.MODE_HEX ) ) );
this.searchResultEditorActionMap.put( copyValueAsLdifAction, new SearchResultEditorActionProxy( cursor,
- this, new CopyValueAction( CopyValueAction.MODE_LDIF ) ) );
+ new CopyValueAction( CopyValueAction.MODE_LDIF ) ) );
this.searchResultEditorActionMap.put( copySearchFilterAction, new SearchResultEditorActionProxy( cursor,
- this, new CopySearchFilterAction( CopySearchFilterAction.MODE_EQUALS ) ) );
+ new CopySearchFilterAction( CopySearchFilterAction.MODE_EQUALS ) ) );
this.searchResultEditorActionMap.put( copyNotSearchFilterAction, new SearchResultEditorActionProxy( cursor,
- this, new CopySearchFilterAction( CopySearchFilterAction.MODE_NOT ) ) );
+ new CopySearchFilterAction( CopySearchFilterAction.MODE_NOT ) ) );
this.searchResultEditorActionMap.put( copyAndSearchFilterAction, new SearchResultEditorActionProxy( cursor,
- this, new CopySearchFilterAction( CopySearchFilterAction.MODE_AND ) ) );
+ new CopySearchFilterAction( CopySearchFilterAction.MODE_AND ) ) );
this.searchResultEditorActionMap.put( copyOrSearchFilterAction, new SearchResultEditorActionProxy( cursor,
- this, new CopySearchFilterAction( CopySearchFilterAction.MODE_OR ) ) );
+ new CopySearchFilterAction( CopySearchFilterAction.MODE_OR ) ) );
this.searchResultEditorActionMap.put( propertyDialogAction, new SearchResultEditorActionProxy( cursor,
- this, new PropertiesAction() ) );
+ new PropertiesAction() ) );
}
@@ -263,7 +262,7 @@
this.openSearchResultEditorPreferencePage = null;
this.showQuickFilterAction.dispose();
this.showQuickFilterAction = null;
-
+
openDefaultValueEditorActionProxy.dispose();
openDefaultValueEditorActionProxy = null;
openBestValueEditorActionProxy.dispose();
@@ -504,17 +503,17 @@
public boolean isEditorActive()
{
- if ( ((AbstractOpenEditorAction)openDefaultValueEditorActionProxy.getAction()).isActive() )
+ if ( ( ( AbstractOpenEditorAction ) openDefaultValueEditorActionProxy.getAction() ).isActive() )
{
return true;
}
- if ( ((AbstractOpenEditorAction)openBestValueEditorActionProxy.getAction()).isActive() )
+ if ( ( ( AbstractOpenEditorAction ) openBestValueEditorActionProxy.getAction() ).isActive() )
{
return true;
}
for ( int i = 0; i < openValueEditorActionProxies.length; i++ )
{
- if ( ((AbstractOpenEditorAction)openValueEditorActionProxies[i].getAction()).isActive() )
+ if ( ( ( AbstractOpenEditorAction ) openValueEditorActionProxies[i].getAction() ).isActive() )
{
return true;
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/BrowserViewActionGroup.java Wed Feb 27 14:09:58 2008
@@ -176,54 +176,54 @@
showDirectoryMetadataEntriesAction = new ShowDirectoryMetadataEntriesAction();
openBrowserPreferencePageAction = new OpenBrowserPreferencePageAction();
- browserActionMap.put( newEntryAction, new BrowserViewActionProxy( viewer, this, new NewEntryAction( view
- .getSite().getWorkbenchWindow() ) ) );
- browserActionMap.put( newSearchAction, new BrowserViewActionProxy( viewer, this, new NewSearchAction() ) );
- browserActionMap.put( newBookmarkAction, new BrowserViewActionProxy( viewer, this, new NewBookmarkAction() ) );
- browserActionMap.put( newBatchOperationAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( newEntryAction, new BrowserViewActionProxy( viewer, new NewEntryAction( view.getSite()
+ .getWorkbenchWindow() ) ) );
+ browserActionMap.put( newSearchAction, new BrowserViewActionProxy( viewer, new NewSearchAction() ) );
+ browserActionMap.put( newBookmarkAction, new BrowserViewActionProxy( viewer, new NewBookmarkAction() ) );
+ browserActionMap.put( newBatchOperationAction, new BrowserViewActionProxy( viewer,
new NewBatchOperationAction() ) );
- browserActionMap.put( locateEntryInDitAction, new BrowserViewActionProxy( viewer, this,
- new LocateEntryInDitAction() ) );
+ browserActionMap
+ .put( locateEntryInDitAction, new BrowserViewActionProxy( viewer, new LocateEntryInDitAction() ) );
- browserActionMap.put( pasteAction, new BrowserViewActionProxy( viewer, this, new PasteAction() ) );
- browserActionMap.put( copyAction, new BrowserViewActionProxy( viewer, this, new CopyAction(
+ browserActionMap.put( pasteAction, new BrowserViewActionProxy( viewer, new PasteAction() ) );
+ browserActionMap.put( copyAction, new BrowserViewActionProxy( viewer, new CopyAction(
( BrowserActionProxy ) browserActionMap.get( pasteAction ) ) ) );
- browserActionMap.put( deleteAction, new BrowserViewActionProxy( viewer, this, new DeleteAction() ) );
- browserActionMap.put( moveAction, new BrowserViewActionProxy( viewer, this, new MoveAction() ) );
- browserActionMap.put( renameAction, new BrowserViewActionProxy( viewer, this, new RenameAction() ) );
+ browserActionMap.put( deleteAction, new BrowserViewActionProxy( viewer, new DeleteAction() ) );
+ browserActionMap.put( moveAction, new BrowserViewActionProxy( viewer, new MoveAction() ) );
+ browserActionMap.put( renameAction, new BrowserViewActionProxy( viewer, new RenameAction() ) );
- browserActionMap.put( copyDnAction, new BrowserViewActionProxy( viewer, this, new CopyDnAction() ) );
- browserActionMap.put( copyUrlAction, new BrowserViewActionProxy( viewer, this, new CopyUrlAction() ) );
+ browserActionMap.put( copyDnAction, new BrowserViewActionProxy( viewer, new CopyDnAction() ) );
+ browserActionMap.put( copyUrlAction, new BrowserViewActionProxy( viewer, new CopyUrlAction() ) );
- browserActionMap.put( copyEntryAsLdifAction, new BrowserViewActionProxy( viewer, this,
- new CopyEntryAsLdifAction( CopyEntryAsLdifAction.MODE_NORMAL ) ) );
- browserActionMap.put( copyEntryAsLdifDnOnlyAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( copyEntryAsLdifAction, new BrowserViewActionProxy( viewer, new CopyEntryAsLdifAction(
+ CopyEntryAsLdifAction.MODE_NORMAL ) ) );
+ browserActionMap.put( copyEntryAsLdifDnOnlyAction, new BrowserViewActionProxy( viewer,
new CopyEntryAsLdifAction( CopyEntryAsLdifAction.MODE_DN_ONLY ) ) );
- browserActionMap.put( copyEntryAsLdifReturningAttributesOnlyAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( copyEntryAsLdifReturningAttributesOnlyAction, new BrowserViewActionProxy( viewer,
new CopyEntryAsLdifAction( CopyEntryAsLdifAction.MODE_RETURNING_ATTRIBUTES_ONLY ) ) );
- browserActionMap.put( copyEntryAsLdifOperationalAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( copyEntryAsLdifOperationalAction, new BrowserViewActionProxy( viewer,
new CopyEntryAsLdifAction( CopyEntryAsLdifAction.MODE_INCLUDE_OPERATIONAL_ATTRIBUTES ) ) );
- browserActionMap.put( copyEntryAsCsvAction, new BrowserViewActionProxy( viewer, this, new CopyEntryAsCsvAction(
+ browserActionMap.put( copyEntryAsCsvAction, new BrowserViewActionProxy( viewer, new CopyEntryAsCsvAction(
CopyEntryAsLdifAction.MODE_NORMAL ) ) );
- browserActionMap.put( copyEntryAsCsvDnOnlyAction, new BrowserViewActionProxy( viewer, this,
- new CopyEntryAsCsvAction( CopyEntryAsLdifAction.MODE_DN_ONLY ) ) );
- browserActionMap.put( copyEntryAsCsvReturningAttributesOnlyAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( copyEntryAsCsvDnOnlyAction, new BrowserViewActionProxy( viewer, new CopyEntryAsCsvAction(
+ CopyEntryAsLdifAction.MODE_DN_ONLY ) ) );
+ browserActionMap.put( copyEntryAsCsvReturningAttributesOnlyAction, new BrowserViewActionProxy( viewer,
new CopyEntryAsCsvAction( CopyEntryAsLdifAction.MODE_RETURNING_ATTRIBUTES_ONLY ) ) );
- browserActionMap.put( copyEntryAsCsvOperationalAction, new BrowserViewActionProxy( viewer, this,
+ browserActionMap.put( copyEntryAsCsvOperationalAction, new BrowserViewActionProxy( viewer,
new CopyEntryAsCsvAction( CopyEntryAsLdifAction.MODE_INCLUDE_OPERATIONAL_ATTRIBUTES ) ) );
- browserActionMap.put( importDsmlAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( importDsmlAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_IMPORT_DSML ) ) );
- browserActionMap.put( exportDsmlAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( exportDsmlAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_EXPORT_DSML ) ) );
- browserActionMap.put( importLdifAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( importLdifAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_IMPORT_LDIF ) ) );
- browserActionMap.put( exportLdifAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( exportLdifAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_EXPORT_LDIF ) ) );
- browserActionMap.put( exportCsvAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( exportCsvAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_EXPORT_CSV ) ) );
- browserActionMap.put( exportExcelAction, new BrowserViewActionProxy( viewer, this, new ImportExportAction(
+ browserActionMap.put( exportExcelAction, new BrowserViewActionProxy( viewer, new ImportExportAction(
ImportExportAction.TYPE_EXPORT_EXCEL ) ) );
}
Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java?rev=631751&r1=631750&r2=631751&view=diff
==============================================================================
--- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java (original)
+++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/ModificationLogsViewActionGroup.java Wed Feb 27 14:09:58 2008
@@ -81,14 +81,14 @@
SourceViewer viewer = this.view.getMainWidget().getSourceViewer();
modificationLogsViewActionMap = new HashMap<String, ModificationLogsViewActionProxy>();
- modificationLogsViewActionMap.put( olderAction, new ModificationLogsViewActionProxy( viewer, this,
- new OlderAction( view ) ) );
- modificationLogsViewActionMap.put( newerAction, new ModificationLogsViewActionProxy( viewer, this,
- new NewerAction( view ) ) );
- modificationLogsViewActionMap.put( refreshAction, new ModificationLogsViewActionProxy( viewer, this,
+ modificationLogsViewActionMap.put( olderAction, new ModificationLogsViewActionProxy( viewer, new OlderAction(
+ view ) ) );
+ modificationLogsViewActionMap.put( newerAction, new ModificationLogsViewActionProxy( viewer, new NewerAction(
+ view ) ) );
+ modificationLogsViewActionMap.put( refreshAction, new ModificationLogsViewActionProxy( viewer,
new RefreshAction( view ) ) );
- modificationLogsViewActionMap.put( clearAction, new ModificationLogsViewActionProxy( viewer, this,
- new ClearAction( view ) ) );
+ modificationLogsViewActionMap.put( clearAction, new ModificationLogsViewActionProxy( viewer, new ClearAction(
+ view ) ) );
enableModificationLogsAction = new EnableModificationLogsAction();
openModificationLogsPreferencePageAction = new OpenModificationLogsPreferencePageAction();
}
|