directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1023720 - in /directory/studio/branches/studio-connection-refactoring/plugins: connection.core/src/main/java/org/apache/directory/studio/connection/core/ connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/ co...
Date Mon, 18 Oct 2010 10:04:27 GMT
Author: pamarcelot
Date: Mon Oct 18 10:04:26 2010
New Revision: 1023720

URL: http://svn.apache.org/viewvc?rev=1023720&view=rev
Log:
Renamed accessor method to 'getConnectionWrapper()'.

Modified:
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java
    directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java
    directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
    directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
    directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/Connection.java Mon Oct 18 10:04:26 2010
@@ -173,7 +173,8 @@ public class Connection implements Conne
 
     private ConnectionParameter connectionParameter;
 
-    private ConnectionWrapper jndiConnectionWrapper;
+    /** The connection wrapper */
+    private ConnectionWrapper connectionWrapper;
 
 
     /**
@@ -207,13 +208,13 @@ public class Connection implements Conne
      * 
      * @return the JNDI connection wrapper
      */
-    public ConnectionWrapper getJNDIConnectionWrapper()
+    public ConnectionWrapper getConnectionWrapper()
     {
-        if ( jndiConnectionWrapper == null )
+        if ( connectionWrapper == null )
         {
-            jndiConnectionWrapper = new DirectoryApiConnectionWrapper( this );
+            connectionWrapper = new DirectoryApiConnectionWrapper( this );
         }
-        return jndiConnectionWrapper;
+        return connectionWrapper;
     }
 
 

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/ConnectionCorePlugin.java Mon Oct 18 10:04:26 2010
@@ -154,7 +154,7 @@ public class ConnectionCorePlugin extend
             Connection[] connections = connectionManager.getConnections();
             for ( int i = 0; i < connections.length; i++ )
             {
-                connections[i].getJNDIConnectionWrapper().disconnect();
+                connections[i].getConnectionWrapper().disconnect();
             }
             connectionManager = null;
         }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/JNDIConnectionWrapper.java Mon Oct 18 10:04:26 2010
@@ -466,7 +466,7 @@ public class JNDIConnectionWrapper imple
                             if ( referralConnection != null )
                             {
                                 String referralDn = referral.getLdapURLs().get( 0 ).getDn().getName();
-                                referralConnection.getJNDIConnectionWrapper().modifyEntry( referralDn,
+                                referralConnection.getConnectionWrapper().modifyEntry( referralDn,
                                     modificationItems, controls, monitor, newReferralsInfo );
                             }
                             else
@@ -574,7 +574,7 @@ public class JNDIConnectionWrapper imple
                             Connection referralConnection = getReferralConnection( referral, monitor, this );
                             if ( referralConnection != null )
                             {
-                                referralConnection.getJNDIConnectionWrapper().renameEntry( oldDn, newDn, deleteOldRdn,
+                                referralConnection.getConnectionWrapper().renameEntry( oldDn, newDn, deleteOldRdn,
                                     controls, monitor, newReferralsInfo );
                             }
                             else
@@ -670,7 +670,7 @@ public class JNDIConnectionWrapper imple
                             if ( referralConnection != null )
                             {
                                 String referralDn = referral.getLdapURLs().get( 0 ).getDn().getName();
-                                referralConnection.getJNDIConnectionWrapper().createEntry( referralDn, attributes,
+                                referralConnection.getConnectionWrapper().createEntry( referralDn, attributes,
                                     controls, monitor, newReferralsInfo );
                             }
                             else
@@ -765,7 +765,7 @@ public class JNDIConnectionWrapper imple
                             if ( referralConnection != null )
                             {
                                 String referralDn = referral.getLdapURLs().get( 0 ).getDn().getName();
-                                referralConnection.getJNDIConnectionWrapper().deleteEntry( referralDn, controls,
+                                referralConnection.getConnectionWrapper().deleteEntry( referralDn, controls,
                                     monitor, newReferralsInfo );
                             }
                             else
@@ -1509,10 +1509,10 @@ public class JNDIConnectionWrapper imple
             referralConnection = referralHandler.getReferralConnection( referral.getLdapURLs() );
 
             // open connection if not yet open
-            if ( referralConnection != null && !referralConnection.getJNDIConnectionWrapper().isConnected() )
+            if ( referralConnection != null && !referralConnection.getConnectionWrapper().isConnected() )
             {
-                referralConnection.getJNDIConnectionWrapper().connect( monitor );
-                referralConnection.getJNDIConnectionWrapper().bind( monitor );
+                referralConnection.getConnectionWrapper().connect( monitor );
+                referralConnection.getConnectionWrapper().bind( monitor );
                 for ( IConnectionListener listener : ConnectionCorePlugin.getDefault().getConnectionListeners() )
                 {
                     listener.connectionOpened( referralConnection, monitor );

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/jndi/StudioNamingEnumeration.java Mon Oct 18 10:04:26 2010
@@ -377,7 +377,7 @@ public class StudioNamingEnumeration imp
                 referralSearchControls.setDerefLinkFlag( searchControls.getDerefLinkFlag() );
                 referralSearchControls.setReturningObjFlag( searchControls.getReturningObjFlag() );
 
-                delegate = referralConnection.getJNDIConnectionWrapper().search( referralSearchBase, referralFilter,
+                delegate = referralConnection.getConnectionWrapper().search( referralSearchBase, referralFilter,
                     referralSearchControls, aliasesDereferencingMethod, referralsHandlingMethod, controls, monitor,
                     referralsInfo );
             }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckBindRunnable.java Mon Oct 18 10:04:26 2010
@@ -77,9 +77,9 @@ public class CheckBindRunnable implement
         monitor.reportProgress( " " ); //$NON-NLS-1$
         monitor.worked( 1 );
 
-        connection.getJNDIConnectionWrapper().connect( monitor );
-        connection.getJNDIConnectionWrapper().bind( monitor );
-        connection.getJNDIConnectionWrapper().disconnect();
+        connection.getConnectionWrapper().connect( monitor );
+        connection.getConnectionWrapper().bind( monitor );
+        connection.getConnectionWrapper().disconnect();
     }
 
 

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CheckNetworkParameterRunnable.java Mon Oct 18 10:04:26 2010
@@ -78,8 +78,8 @@ public class CheckNetworkParameterRunnab
         monitor.reportProgress( " " ); //$NON-NLS-1$
         monitor.worked( 1 );
 
-        connection.getJNDIConnectionWrapper().connect( monitor );
-        connection.getJNDIConnectionWrapper().disconnect();
+        connection.getConnectionWrapper().connect( monitor );
+        connection.getConnectionWrapper().disconnect();
     }
 
 

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/CloseConnectionsRunnable.java Mon Oct 18 10:04:26 2010
@@ -116,14 +116,14 @@ public class CloseConnectionsRunnable im
 
         for ( Connection connection : connections )
         {
-            if ( connection.getJNDIConnectionWrapper().isConnected() )
+            if ( connection.getConnectionWrapper().isConnected() )
             {
                 monitor.setTaskName( Messages.bind( Messages.jobs__close_connections_task, new String[]
                     { connection.getName() } ) );
                 monitor.worked( 1 );
 
-                connection.getJNDIConnectionWrapper().unbind();
-                connection.getJNDIConnectionWrapper().disconnect();
+                connection.getConnectionWrapper().unbind();
+                connection.getConnectionWrapper().disconnect();
             }
         }
     }
@@ -136,7 +136,7 @@ public class CloseConnectionsRunnable im
     {
         for ( Connection connection : connections )
         {
-            if ( !connection.getJNDIConnectionWrapper().isConnected() )
+            if ( !connection.getConnectionWrapper().isConnected() )
             {
                 for ( IConnectionListener listener : ConnectionCorePlugin.getDefault().getConnectionListeners() )
                 {
@@ -147,7 +147,7 @@ public class CloseConnectionsRunnable im
 
         for ( Connection connection : connections )
         {
-            if ( !connection.getJNDIConnectionWrapper().isConnected() )
+            if ( !connection.getConnectionWrapper().isConnected() )
             {
                 ConnectionEventRegistry.fireConnectionClosed( connection, this );
             }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/OpenConnectionsRunnable.java Mon Oct 18 10:04:26 2010
@@ -102,16 +102,16 @@ public class OpenConnectionsRunnable imp
 
         for ( Connection connection : connections )
         {
-            if ( !connection.getJNDIConnectionWrapper().isConnected() )
+            if ( !connection.getConnectionWrapper().isConnected() )
             {
                 monitor.setTaskName( Messages.bind( Messages.jobs__open_connections_task, new String[]
                     { connection.getName() } ) );
                 monitor.worked( 1 );
 
-                connection.getJNDIConnectionWrapper().connect( monitor );
-                if ( connection.getJNDIConnectionWrapper().isConnected() )
+                connection.getConnectionWrapper().connect( monitor );
+                if ( connection.getConnectionWrapper().isConnected() )
                 {
-                    connection.getJNDIConnectionWrapper().bind( monitor );
+                    connection.getConnectionWrapper().bind( monitor );
                 }
             }
         }
@@ -125,7 +125,7 @@ public class OpenConnectionsRunnable imp
     {
         for ( Connection connection : connections )
         {
-            if ( connection.getJNDIConnectionWrapper().isConnected() )
+            if ( connection.getConnectionWrapper().isConnected() )
             {
                 for ( IConnectionListener listener : ConnectionCorePlugin.getDefault().getConnectionListeners() )
                 {
@@ -136,7 +136,7 @@ public class OpenConnectionsRunnable imp
 
         for ( Connection connection : connections )
         {
-            if ( connection.getJNDIConnectionWrapper().isConnected() )
+            if ( connection.getConnectionWrapper().isConnected() )
             {
                 ConnectionEventRegistry.fireConnectionOpened( connection, this );
             }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/jobs/StudioConnectionJob.java Mon Oct 18 10:04:26 2010
@@ -67,19 +67,19 @@ public class StudioConnectionJob extends
             {
                 for ( Connection connection : connections )
                 {
-                    if ( connection != null && !connection.getJNDIConnectionWrapper().isConnected() )
+                    if ( connection != null && !connection.getConnectionWrapper().isConnected() )
                     {
                         monitor.setTaskName( Messages.bind( Messages.jobs__open_connections_task, new String[]
                             { connection.getName() } ) );
                         monitor.worked( 1 );
 
-                        connection.getJNDIConnectionWrapper().connect( monitor );
-                        if ( connection.getJNDIConnectionWrapper().isConnected() )
+                        connection.getConnectionWrapper().connect( monitor );
+                        if ( connection.getConnectionWrapper().isConnected() )
                         {
-                            connection.getJNDIConnectionWrapper().bind( monitor );
+                            connection.getConnectionWrapper().bind( monitor );
                         }
 
-                        if ( connection.getJNDIConnectionWrapper().isConnected() )
+                        if ( connection.getConnectionWrapper().isConnected() )
                         {
                             for ( IConnectionListener listener : ConnectionCorePlugin.getDefault()
                                 .getConnectionListeners() )

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/RunnableContextRunner.java Mon Oct 18 10:04:26 2010
@@ -74,19 +74,19 @@ public class RunnableContextRunner
                 {
                     for ( Connection connection : connections )
                     {
-                        if ( connection != null && !connection.getJNDIConnectionWrapper().isConnected() )
+                        if ( connection != null && !connection.getConnectionWrapper().isConnected() )
                         {
                             spm[0].setTaskName( Messages.bind( Messages.jobs__open_connections_task, new String[]
                                 { connection.getName() } ) );
                             spm[0].worked( 1 );
 
-                            connection.getJNDIConnectionWrapper().connect( spm[0] );
-                            if ( connection.getJNDIConnectionWrapper().isConnected() )
+                            connection.getConnectionWrapper().connect( spm[0] );
+                            if ( connection.getConnectionWrapper().isConnected() )
                             {
-                                connection.getJNDIConnectionWrapper().bind( spm[0] );
+                                connection.getConnectionWrapper().bind( spm[0] );
                             }
 
-                            if ( connection.getJNDIConnectionWrapper().isConnected() )
+                            if ( connection.getConnectionWrapper().isConnected() )
                             {
                                 for ( IConnectionListener listener : ConnectionCorePlugin.getDefault()
                                     .getConnectionListeners() )

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/CloseConnectionAction.java Mon Oct 18 10:04:26 2010
@@ -89,7 +89,7 @@ public class CloseConnectionAction exten
         boolean canClose = false;
         for ( int i = 0; i < getSelectedConnections().length; i++ )
         {
-            if ( getSelectedConnections()[i].getJNDIConnectionWrapper().isConnected() )
+            if ( getSelectedConnections()[i].getConnectionWrapper().isConnected() )
             {
                 canClose = true;
                 break;

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/actions/OpenConnectionAction.java Mon Oct 18 10:04:26 2010
@@ -88,7 +88,7 @@ public class OpenConnectionAction extend
         boolean canOpen = false;
         for ( int i = 0; i < getSelectedConnections().length; i++ )
         {
-            if ( !getSelectedConnections()[i].getJNDIConnectionWrapper().isConnected() )
+            if ( !getSelectedConnections()[i].getConnectionWrapper().isConnected() )
             {
                 canOpen = true;
                 break;

Modified: directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/connection.ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java Mon Oct 18 10:04:26 2010
@@ -96,13 +96,13 @@ public class ConnectionLabelProvider ext
             if ( ( conn.getEncryptionMethod() == EncryptionMethod.LDAPS )
                 || ( conn.getEncryptionMethod() == EncryptionMethod.START_TLS ) )
             {
-                return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
+                return conn.getConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_SSL_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_SSL_DISCONNECTED );
             }
             else
             {
-                return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
+                return conn.getConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage(
                     ConnectionUIConstants.IMG_CONNECTION_DISCONNECTED );
             }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/widgets/browser/BrowserContentProvider.java Mon Oct 18 10:04:26 2010
@@ -502,7 +502,7 @@ public class BrowserContentProvider impl
                 {
                     // open connection when expanding DIT
                     if ( browserConnection.getConnection() != null
-                        && !browserConnection.getConnection().getJNDIConnectionWrapper().isConnected() )
+                        && !browserConnection.getConnection().getConnectionWrapper().isConnected() )
                     {
                         new StudioBrowserJob( new OpenConnectionsRunnable( browserConnection.getConnection() ) )
                             .execute();

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/BrowserConnectionListener.java Mon Oct 18 10:04:26 2010
@@ -143,7 +143,7 @@ public class BrowserConnectionListener i
 
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper().setBinaryAttributes( binaryAttributeNames );
+            browserConnection.getConnection().getConnectionWrapper().setBinaryAttributes( binaryAttributeNames );
         }
     }
 

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CopyEntriesRunnable.java Mon Oct 18 10:04:26 2010
@@ -237,7 +237,7 @@ public class CopyEntriesRunnable impleme
         NamingEnumeration<SearchResult> result = entryToCopy
             .getBrowserConnection()
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .search( entryToCopy.getDn().getName(), ISearch.FILTER_TRUE, searchControls,
                 AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, controls, monitor, null );
 
@@ -312,7 +312,7 @@ public class CopyEntriesRunnable impleme
                 }
 
                 // create entry
-                targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
+                targetBrowserConnection.getConnection().getConnectionWrapper()
                     .createEntry( newLdapDn.getName(), newAttributes, controls, dummyMonitor, null );
 
                 while ( dummyMonitor.errorsReported() )
@@ -352,7 +352,7 @@ public class CopyEntriesRunnable impleme
                                     // modify entry
                                     targetBrowserConnection
                                         .getConnection()
-                                        .getJNDIConnectionWrapper()
+                                        .getConnectionWrapper()
                                         .modifyEntry( newLdapDn.getName(),
                                             mis.toArray( new ModificationItem[mis.size()] ), null, dummyMonitor, null );
 
@@ -375,7 +375,7 @@ public class CopyEntriesRunnable impleme
                                     newLdapDn = DnUtils.composeDn( renamedRdn, parentDn );
 
                                     // create entry
-                                    targetBrowserConnection.getConnection().getJNDIConnectionWrapper()
+                                    targetBrowserConnection.getConnection().getConnectionWrapper()
                                         .createEntry( newLdapDn.getName(), newAttributes, null, dummyMonitor, null );
 
                                     break;
@@ -412,7 +412,7 @@ public class CopyEntriesRunnable impleme
                         searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
                         NamingEnumeration<SearchResult> childEntries = sourceBrowserConnection
                             .getConnection()
-                            .getJNDIConnectionWrapper()
+                            .getConnectionWrapper()
                             .search( oldLdapDn.getName(), ISearch.FILTER_TRUE, searchControls,
                                 AliasDereferencingMethod.NEVER, ReferralHandlingMethod.IGNORE, null, monitor, null );
 

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/CreateEntryRunnable.java Mon Oct 18 10:04:26 2010
@@ -180,7 +180,7 @@ public class CreateEntryRunnable impleme
 
 
     /**
-     * Creates the entry using the underlying JNDI connection wrapper.
+     * Creates the entry using the underlying connection wrapper.
      * 
      * @param browserConnection the browser connection
      * @param entryToCreate the entry to create
@@ -221,7 +221,7 @@ public class CreateEntryRunnable impleme
                 { new ManageReferralControl( false ) };
         }
 
-        browserConnection.getConnection().getJNDIConnectionWrapper()
+        browserConnection.getConnection().getConnectionWrapper()
             .createEntry( dn, jndiAttributes, controls, monitor, null );
     }
 }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/DeleteEntriesRunnable.java Mon Oct 18 10:04:26 2010
@@ -297,7 +297,7 @@ public class DeleteEntriesRunnable imple
                 searchControls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
                 NamingEnumeration<SearchResult> result = browserConnection
                     .getConnection()
-                    .getJNDIConnectionWrapper()
+                    .getConnectionWrapper()
                     .search( dn.getName(), ISearch.FILTER_TRUE, searchControls, aliasDereferencingMethod,
                         referralsHandlingMethod, null, dummyMonitor, null );
 
@@ -379,7 +379,7 @@ public class DeleteEntriesRunnable imple
         // delete entry
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .deleteEntry( dn.getName(), controls, monitor, null );
         }
     }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java Mon Oct 18 10:04:26 2010
@@ -350,7 +350,7 @@ public class ImportDsmlRunnable implemen
         Entry entry = request.getEntry();
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .createEntry( entry.getDn().getName(), AttributeUtils.toAttributes( entry ), getControls( request ),
                 monitor, null );
 
@@ -418,7 +418,7 @@ public class ImportDsmlRunnable implemen
         StudioProgressMonitor monitor )
     {
         // Executing the del request
-        browserConnection.getConnection().getJNDIConnectionWrapper()
+        browserConnection.getConnection().getConnectionWrapper()
             .deleteEntry( request.getName().getName(), getControls( request ), monitor, null );
 
         // Creating the response
@@ -496,7 +496,7 @@ public class ImportDsmlRunnable implemen
         // Executing the modify request
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .modifyEntry( request.getName().getName(), modificationItems.toArray( new ModificationItem[0] ),
                 getControls( request ), monitor, null );
 
@@ -557,7 +557,7 @@ public class ImportDsmlRunnable implemen
         // Executing the modify DN request
         browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .renameEntry( request.getName().getName(), request.getNewRdn().getName(), request.getDeleteOldRdn(),
                 getControls( request ), monitor, null );
 
@@ -617,7 +617,7 @@ public class ImportDsmlRunnable implemen
             // [Optimization] We're only searching if we need to produce a response
             StudioNamingEnumeration ne = browserConnection
                 .getConnection()
-                .getJNDIConnectionWrapper()
+                .getConnectionWrapper()
                 .search( request.getBase().getName(), request.getFilter().toString(),
                     getSearchControls( request ), getAliasDereferencingMethod( request ),
                     ReferralHandlingMethod.IGNORE, getControls( request ), monitor, null );

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportLdifRunnable.java Mon Oct 18 10:04:26 2010
@@ -461,7 +461,7 @@ public class ImportLdifRunnable implemen
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .createEntry( dn, jndiAttributes, getControls( record ), monitor, null );
 
             if ( monitor.errorsReported() && updateIfEntryExists
@@ -471,14 +471,14 @@ public class ImportLdifRunnable implemen
                 monitor.reset();
 
                 ModificationItem[] mis = ModelConverter.entryToReplaceModificationItems( dummyEntry );
-                browserConnection.getConnection().getJNDIConnectionWrapper()
+                browserConnection.getConnection().getConnectionWrapper()
                     .modifyEntry( dn, mis, getControls( record ), monitor, null );
             }
         }
         else if ( record instanceof LdifChangeDeleteRecord )
         {
             LdifChangeDeleteRecord changeDeleteRecord = ( LdifChangeDeleteRecord ) record;
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .deleteEntry( dn, getControls( changeDeleteRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModifyRecord )
@@ -511,7 +511,7 @@ public class ImportLdifRunnable implemen
                 }
             }
 
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .modifyEntry( dn, mis, getControls( modifyRecord ), monitor, null );
         }
         else if ( record instanceof LdifChangeModDnRecord )
@@ -534,7 +534,7 @@ public class ImportLdifRunnable implemen
                     newDn = DnUtils.composeDn( newRdn, parent.getName() );
                 }
 
-                browserConnection.getConnection().getJNDIConnectionWrapper()
+                browserConnection.getConnection().getConnectionWrapper()
                     .renameEntry( dn, newDn.toString(), deleteOldRdn, getControls( modDnRecord ), monitor, null );
             }
         }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/RenameEntryRunnable.java Mon Oct 18 10:04:26 2010
@@ -292,7 +292,7 @@ public class RenameEntryRunnable impleme
 
         if ( browserConnection.getConnection() != null )
         {
-            browserConnection.getConnection().getJNDIConnectionWrapper()
+            browserConnection.getConnection().getConnectionWrapper()
                 .renameEntry( oldDnString, newDnString, true, controls, monitor, null );
         }
     }

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/SearchRunnable.java Mon Oct 18 10:04:26 2010
@@ -497,7 +497,7 @@ public class SearchRunnable implements S
 
         StudioNamingEnumeration result = browserConnection
             .getConnection()
-            .getJNDIConnectionWrapper()
+            .getConnectionWrapper()
             .search( searchBase, filter, controls, aliasesDereferencingMethod, referralsHandlingMethod, jndiControls,
                 monitor, null );
         return result;

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/impl/DelegateEntry.java Mon Oct 18 10:04:26 2010
@@ -103,7 +103,7 @@ public abstract class DelegateEntry impl
         delegate = browserConnection.getEntryFromCache( dn );
 
         if ( delegate != null
-            && !delegate.getBrowserConnection().getConnection().getJNDIConnectionWrapper().isConnected() )
+            && !delegate.getBrowserConnection().getConnection().getConnectionWrapper().isConnected() )
         {
             entryDoesNotExist = false;
             delegate = null;

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java Mon Oct 18 10:04:26 2010
@@ -311,7 +311,7 @@ public class ImportExportAction extends 
     protected IBrowserConnection getConnection()
     {
         if ( getSelectedConnections().length > 0
-            && getSelectedConnections()[0].getJNDIConnectionWrapper().isConnected() )
+            && getSelectedConnections()[0].getConnectionWrapper().isConnected() )
         {
             Connection connection = getSelectedConnections()[0];
             IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager()

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/ConnectionViewUniversalListener.java Mon Oct 18 10:04:26 2010
@@ -159,9 +159,9 @@ public class ConnectionViewUniversalList
      */
     private void toggleConnection( Connection connection )
     {
-        if ( connection.getJNDIConnectionWrapper().isConnected() )
+        if ( connection.getConnectionWrapper().isConnected() )
         {
-            connection.getJNDIConnectionWrapper().disconnect();
+            connection.getConnectionWrapper().disconnect();
         }
         else
         {

Modified: directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java Mon Oct 18 10:04:26 2010
@@ -110,7 +110,7 @@ public class BatchOperationWizard extend
         // if(searches.length + entries.length + searchResults.length +
         // bookmarks.length > 0) {
         if ( connections.length > 0
-            && connections[0].getJNDIConnectionWrapper().isConnected()
+            && connections[0].getConnectionWrapper().isConnected()
             || searches.length + entries.length + searchResults.length + bookmarks.length + attributes.length
                 + values.length > 0 )
         {

Modified: directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Mon Oct 18 10:04:26 2010
@@ -94,7 +94,7 @@ public class ApacheDsSchemaConnector ext
     {
         List<Schema> schemas = new ArrayList<Schema>();
 
-        ConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
 
@@ -146,7 +146,7 @@ public class ApacheDsSchemaConnector ext
      */
     public boolean isSuitableConnector( Connection connection, StudioProgressMonitor monitor )
     {
-        ConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );

Modified: directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1023720&r1=1023719&r2=1023720&view=diff
==============================================================================
--- directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/branches/studio-connection-refactoring/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Mon Oct 18 10:04:26 2010
@@ -80,7 +80,7 @@ public class GenericSchemaConnector exte
     {
         List<Schema> schemas = new ArrayList<Schema>();
 
-        ConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         monitor.beginTask( Messages.getString( "GenericSchemaConnector.FetchingSchema" ), 1 ); //$NON-NLS-1$
 
@@ -131,7 +131,7 @@ public class GenericSchemaConnector exte
 
     private static String getSubschemaSubentry( Connection connection, StudioProgressMonitor monitor )
     {
-        ConnectionWrapper wrapper = connection.getJNDIConnectionWrapper();
+        ConnectionWrapper wrapper = connection.getConnectionWrapper();
 
         SearchControls constraintSearch = new SearchControls();
         constraintSearch.setSearchScope( SearchControls.OBJECT_SCOPE );



Mime
View raw message