You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/09/24 23:04:29 UTC
svn commit: r578966 [2/2] - in /directory/studio/trunk:
studio-connection-core/src/main/java/org/apache/directory/studio/connection/core/
studio-connection-core/src/main/java/org/apache/directory/studio/connection/core/event/
studio-connection-core/src...
Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java (original)
+++ directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionWidget.java Mon Sep 24 14:04:06 2007
@@ -23,12 +23,12 @@
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.Tree;
import org.eclipse.ui.IActionBars;
@@ -56,11 +56,11 @@
/** The action bars */
private IActionBars actionBars;
- /** The table widget used by the table viewer */
- private Table table;
+ /** The tree widget used by the tree viewer */
+ private Tree tree;
- /** The table viewer */
- private TableViewer viewer;
+ /** The tree viewer */
+ private TreeViewer viewer;
/**
@@ -146,19 +146,18 @@
*/
protected Control createContent( Composite parent )
{
-
- table = new Table( parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
+ tree = new Tree( parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER );
GridData data = new GridData( GridData.FILL_BOTH );
data.widthHint = 450;
data.heightHint = 250;
- table.setLayoutData( data );
- viewer = new TableViewer( table );
+ tree.setLayoutData( data );
+ viewer = new TreeViewer( tree );
// setup providers
viewer.setContentProvider( configuration.getContentProvider( viewer ) );
viewer.setLabelProvider( configuration.getLabelProvider( viewer ) );
- return table;
+ return tree;
}
@@ -178,7 +177,7 @@
*/
public void setFocus()
{
- viewer.getTable().setFocus();
+ viewer.getTree().setFocus();
}
@@ -192,19 +191,19 @@
configuration.dispose();
configuration = null;
- table.dispose();
- table = null;
+ tree.dispose();
+ tree = null;
viewer = null;
}
}
/**
- * Gets the table viewer.
+ * Gets the tree viewer.
*
- * @return the table viewer
+ * @return the tree viewer
*/
- public TableViewer getViewer()
+ public TreeViewer getViewer()
{
return viewer;
}
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/BrowserAction.java Mon Sep 24 14:04:06 2007
@@ -25,9 +25,6 @@
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserEntryPage;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserSearchResultPage;
-import org.apache.directory.studio.ldapbrowser.core.events.BookmarkUpdateEvent;
-import org.apache.directory.studio.ldapbrowser.core.events.EntryModificationEvent;
-import org.apache.directory.studio.ldapbrowser.core.events.SearchUpdateEvent;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
@@ -268,39 +265,6 @@
protected Shell getShell()
{
return PlatformUI.getWorkbench().getDisplay().getActiveShell();
- }
-
-
- /**
- * This method is fired when an Entry is updated.
- *
- * @param event
- * the associated event
- */
- public final void entryUpdated( EntryModificationEvent event )
- {
- }
-
-
- /**
- * This method is fired when a Search is updated.
- *
- * @param searchUpdateEvent
- * the associated event
- */
- public void searchUpdated( SearchUpdateEvent searchUpdateEvent )
- {
- }
-
-
- /**
- * This method is fired when a Bookmark is updated.
- *
- * @param bookmarkUpdateEvent
- * the associated event
- */
- public void bookmarkUpdated( BookmarkUpdateEvent bookmarkUpdateEvent )
- {
}
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/actions/proxy/BrowserActionProxy.java Mon Sep 24 14:04:06 2007
@@ -22,6 +22,7 @@
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;
@@ -109,7 +110,6 @@
{
if ( !this.isDisposed() )
{
- this.action.entryUpdated( entryModificationEvent );
this.updateAction();
}
}
@@ -119,7 +119,6 @@
{
if ( !this.isDisposed() )
{
- this.action.searchUpdated( searchUpdateEvent );
this.updateAction();
}
}
@@ -129,7 +128,6 @@
{
if ( !this.isDisposed() )
{
- this.action.bookmarkUpdated( bookmarkUpdateEvent );
this.updateAction();
}
}
@@ -142,7 +140,6 @@
{
if ( !isDisposed() )
{
- action.connectionUpdated( connection );
updateAction();
}
}
@@ -181,6 +178,15 @@
public void connectionClosed( Connection connection )
{
connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
+ connectionUpdated( null );
}
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectBrowserConnectionDialog.java Mon Sep 24 14:04:06 2007
@@ -173,7 +173,7 @@
// create main widget
connectionMainWidget = new ConnectionWidget( connectionConfiguration, null );
connectionMainWidget.createWidget( composite );
- connectionMainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionManager() );
+ connectionMainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() );
// create actions and context menu (and register global actions)
connectionActionGroup = new ConnectionActionGroup( connectionMainWidget, connectionConfiguration );
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectReferralConnectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectReferralConnectionDialog.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectReferralConnectionDialog.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectReferralConnectionDialog.java Mon Sep 24 14:04:06 2007
@@ -21,6 +21,7 @@
package org.apache.directory.studio.ldapbrowser.common.dialogs;
+import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
import org.apache.directory.studio.connection.ui.widgets.ConnectionActionGroup;
import org.apache.directory.studio.connection.ui.widgets.ConnectionConfiguration;
@@ -139,7 +140,7 @@
// create main widget
this.mainWidget = new ConnectionWidget( this.configuration, null );
this.mainWidget.createWidget( composite );
- this.mainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionManager() );
+ this.mainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() );
// create actions and context menu (and register global actions)
this.actionGroup = new ConnectionActionGroup( this.mainWidget, this.configuration );
@@ -158,9 +159,12 @@
if ( !event.getSelection().isEmpty() )
{
Object o = ( ( IStructuredSelection ) event.getSelection() ).getFirstElement();
- if ( o instanceof IBrowserConnection )
+ if ( o instanceof Connection )
{
- selectedConnection = ( IBrowserConnection ) o;
+ Connection connection = ( Connection ) o;
+ IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
+ .getBrowserConnection( connection );
+ selectedConnection = browserConnection;
}
}
}
@@ -173,10 +177,12 @@
if ( !event.getSelection().isEmpty() )
{
Object o = ( ( IStructuredSelection ) event.getSelection() ).getFirstElement();
- if ( o instanceof IBrowserConnection )
+ if ( o instanceof Connection )
{
- selectedConnection = ( IBrowserConnection ) o;
- okPressed();
+ Connection connection = ( Connection ) o;
+ IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()
+ .getBrowserConnection( connection );
+ selectedConnection = browserConnection;
}
}
}
@@ -192,7 +198,7 @@
if ( connectionUrl != null && referralUrl.toString().startsWith( connectionUrl.toString() ) )
{
this.mainWidget.getViewer().reveal( connection );
- this.mainWidget.getViewer().setSelection( new StructuredSelection( connection ), true );
+ this.mainWidget.getViewer().setSelection( new StructuredSelection( connection.getConnection() ), true );
}
}
}
Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserUniversalListener.java Mon Sep 24 14:04:06 2007
@@ -22,6 +22,7 @@
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;
@@ -187,6 +188,14 @@
public void connectionRemoved( Connection connection )
{
viewer.refresh();
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
}
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionManager.java Mon Sep 24 14:04:06 2007
@@ -39,6 +39,7 @@
import org.apache.commons.io.FileUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
+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.ldapbrowser.core.events.BookmarkUpdateEvent;
@@ -323,7 +324,15 @@
{
}
-
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
+ }
+
+
/**
* @see org.apache.directory.studio.ldapbrowser.core.events.BrowserConnectionUpdateListener#browserConnectionUpdated(org.apache.directory.studio.ldapbrowser.core.events.BrowserConnectionUpdateEvent)
*/
Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/BrowserConnection.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/BrowserConnection.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/BrowserConnection.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/internal/model/BrowserConnection.java Mon Sep 24 14:04:06 2007
@@ -31,6 +31,7 @@
import java.util.Set;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
+import org.apache.directory.studio.connection.core.ConnectionFolder;
import org.apache.directory.studio.connection.core.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.ConnectionParameter.AuthenticationMethod;
import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
@@ -1053,4 +1054,11 @@
}
}
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
+ }
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java Mon Sep 24 14:04:06 2007
@@ -241,7 +241,7 @@
if ( mode == MODE_NONE )
{
- return true;
+ return getConnection() != null;
}
else if ( mode == MODE_OBJECTCLASS )
{
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ConnectionComboContributionItem.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ConnectionComboContributionItem.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ConnectionComboContributionItem.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ConnectionComboContributionItem.java Mon Sep 24 14:04:06 2007
@@ -23,6 +23,7 @@
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.core.ConnectionCorePlugin;
+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;
@@ -212,6 +213,14 @@
public void connectionClosed( Connection connection )
{
connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionView.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionView.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionView.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionView.java Mon Sep 24 14:04:06 2007
@@ -131,7 +131,7 @@
// create main widget
mainWidget = new ConnectionWidget( configuration, getViewSite().getActionBars() );
mainWidget.createWidget( composite );
- mainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionManager() );
+ mainWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() );
// create actions and context menu (and register global actions)
actionGroup = new ConnectionViewActionGroup( this );
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewActionGroup.java Mon Sep 24 14:04:06 2007
@@ -24,7 +24,6 @@
import org.apache.directory.studio.connection.ui.actions.ConnectionViewActionProxy;
import org.apache.directory.studio.connection.ui.dnd.ConnectionTransfer;
import org.apache.directory.studio.connection.ui.widgets.ConnectionActionGroup;
-import org.apache.directory.studio.ldapbrowser.common.actions.SelectAllAction;
import org.apache.directory.studio.ldapbrowser.common.dnd.SearchTransfer;
import org.apache.directory.studio.ldapbrowser.ui.actions.ImportExportAction;
import org.apache.directory.studio.ldapbrowser.ui.actions.OpenSchemaBrowserAction;
@@ -32,11 +31,10 @@
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.actions.ActionFactory;
/**
@@ -54,9 +52,6 @@
/** The link with editor action. */
private LinkWithEditorAction linkWithEditorAction;
- /** The Constant selectAllAction. */
- private static final String selectAllAction = "selectAllAction";
-
/** The Constant importDsmlAction. */
private static final String importDsmlAction = "importDsmlAction";
@@ -95,11 +90,9 @@
{
super( view.getMainWidget(), view.getConfiguration() );
this.view = view;
- TableViewer viewer = view.getMainWidget().getViewer();
+ TreeViewer viewer = view.getMainWidget().getViewer();
linkWithEditorAction = new LinkWithEditorAction( view );
- connectionActionMap.put( selectAllAction, new ConnectionViewActionProxy( viewer, this, new SelectAllAction(
- viewer ) ) );
connectionActionMap.put( importDsmlAction, new ConnectionViewActionProxy( viewer, this, new ImportExportAction(
ImportExportAction.TYPE_IMPORT_DSML ) ) );
connectionActionMap.put( exportDsmlAction, new ConnectionViewActionProxy( viewer, this, new ImportExportAction(
@@ -151,6 +144,7 @@
// add
menuManager.add( ( IAction ) connectionActionMap.get( newConnectionAction ) );
+ menuManager.add( ( IAction ) connectionActionMap.get( newConnectionFolderAction ) );
menuManager.add( new Separator() );
// open/close
@@ -171,7 +165,6 @@
menuManager.add( ( IAction ) connectionActionMap.get( copyConnectionAction ) );
menuManager.add( ( IAction ) connectionActionMap.get( pasteConnectionAction ) );
menuManager.add( ( IAction ) connectionActionMap.get( deleteConnectionAction ) );
- menuManager.add( ( IAction ) connectionActionMap.get( selectAllAction ) );
menuManager.add( ( IAction ) connectionActionMap.get( renameConnectionAction ) );
menuManager.add( new Separator() );
@@ -195,39 +188,6 @@
// properties
menuManager.add( ( IAction ) connectionActionMap.get( propertyDialogAction ) );
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void activateGlobalActionHandlers()
- {
-
- if ( actionBars != null )
- {
- actionBars.setGlobalActionHandler( ActionFactory.SELECT_ALL.getId(), ( IAction ) connectionActionMap
- .get( selectAllAction ) );
- }
-
- super.activateGlobalActionHandlers();
-
- }
-
-
- /**
- * {@inheritDoc}
- */
- public void deactivateGlobalActionHandlers()
- {
-
- if ( actionBars != null )
- {
- actionBars.setGlobalActionHandler( ActionFactory.SELECT_ALL.getId(), null );
- }
-
- super.deactivateGlobalActionHandlers();
-
}
}
Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/DropConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/DropConnectionListener.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/DropConnectionListener.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/DropConnectionListener.java Mon Sep 24 14:04:06 2007
@@ -38,7 +38,7 @@
/**
* This class implements a {@link DropTargetListener} that is used to
- * drag and drop connections withing the connections view.
+ * drag and drop connections within the connections view.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
Modified: directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java (original)
+++ directory/studio/trunk/studio-ldifeditor/src/main/java/org/apache/directory/studio/ldifeditor/editor/LdifEditor.java Mon Sep 24 14:04:06 2007
@@ -25,6 +25,7 @@
import java.util.ResourceBundle;
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;
@@ -625,6 +626,14 @@
public void connectionClosed( Connection connection )
{
connectionUpdated( connection );
+ }
+
+
+ /**
+ * @see org.apache.directory.studio.connection.core.event.ConnectionUpdateListener#connectionFolderModified(org.apache.directory.studio.connection.core.ConnectionFolder)
+ */
+ public void connectionFolderModified( ConnectionFolder connectionFolder )
+ {
}
Modified: directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java?rev=578966&r1=578965&r2=578966&view=diff
==============================================================================
--- directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java (original)
+++ directory/studio/trunk/studio-schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewProjectWizardConnectionSelectionPage.java Mon Sep 24 14:04:06 2007
@@ -89,10 +89,10 @@
// Creating configuration
configuration = new ConnectionConfiguration();
- // Creating Connection Widet
+ // Creating Connection Widget
connectionWidget = new ConnectionWidget( configuration, null );
connectionWidget.createWidget( composite );
- connectionWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionManager() );
+ connectionWidget.setInput( ConnectionCorePlugin.getDefault().getConnectionFolderManager() );
connectionWidget.getViewer().addSelectionChangedListener( new ISelectionChangedListener()
{