directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r569899 [7/9] - in /directory/studio/trunk: studio-aciitemeditor/META-INF/ studio-aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/ studio-aciitemeditor/src/main/java/org/apache/directory/studio/aciitemeditor/valueedito...
Date Sun, 26 Aug 2007 22:36:14 GMT
Copied: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java (from r560556, directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IConnection.java)
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java?p2=directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java&p1=directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IConnection.java&r1=560556&r2=569899&rev=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IConnection.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IBrowserConnection.java Sun Aug 26 15:36:01 2007
@@ -24,20 +24,31 @@
 import java.io.Serializable;
 import java.io.Writer;
 
+import org.apache.directory.studio.connection.core.Connection;
+import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
+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;
 import org.apache.directory.studio.ldapbrowser.core.BookmarkManager;
 import org.apache.directory.studio.ldapbrowser.core.SearchManager;
 import org.apache.directory.studio.ldapbrowser.core.internal.model.ConnectionException;
 import org.apache.directory.studio.ldapbrowser.core.internal.model.ModificationLogger;
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExtendedProgressMonitor;
 import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
-import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider;
 import org.eclipse.core.runtime.IAdaptable;
 
 
-public interface IConnection extends Serializable, IAdaptable, ConnectionPropertyPageProvider
+public interface IBrowserConnection extends Serializable, IAdaptable, ConnectionPropertyPageProvider
 {
 
+    public static String CONNECTION_PARAMETER_FETCH_BASE_DNS = "ldapbrowser.fetchBaseDns";
+    public static String CONNECTION_PARAMETER_BASE_DN = "ldapbrowser.baseDn";
+    public static String CONNECTION_PARAMETER_COUNT_LIMIT = "ldapbrowser.countLimit";
+    public static String CONNECTION_PARAMETER_TIME_LIMIT = "ldapbrowser.timeLimit";
+    public static String CONNECTION_PARAMETER_ALIASES_DEREFERENCING_METHOD = "ldapbrowser.aliasesDereferencingMethod";
+    public static String CONNECTION_PARAMETER_REFERRALS_HANDLING_METHOD = "ldapbrowser.referralsHandlingMethod";
+    
+    
     public static final String[] ROOT_DSE_ATTRIBUTES =
         { IRootDSE.ROOTDSE_ATTRIBUTE_MONITORCONTEXT, IRootDSE.ROOTDSE_ATTRIBUTE_NAMINGCONTEXTS,
             IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDLDAPVERSION, IRootDSE.ROOTDSE_ATTRIBUTE_SUBSCHEMASUBENTRY,
@@ -46,20 +57,6 @@
             IRootDSE.ROOTDSE_ATTRIBUTE_SUPPORTEDSASLMECHANISM, ISearch.ALL_OPERATIONAL_ATTRIBUTES,
             ISearch.ALL_USER_ATTRIBUTES };
 
-    public static final int AUTH_ANONYMOUS = 0;
-
-    public static final int AUTH_SIMPLE = 1;
-    
-    public static final int AUTH_SASL_DIGMD5 = 2;
-    
-    public static final int AUTH_SASL_CRAMD5 = 3;
-
-    public static final int ENCYRPTION_NONE = 0;
-
-    public static final int ENCYRPTION_LDAPS = 1;
-
-    public static final int ENCYRPTION_STARTTLS = 2;
-
     public static final int DEREFERENCE_ALIASES_NEVER = 0;
 
     public static final int DEREFERENCE_ALIASES_ALWAYS = 1;
@@ -114,10 +111,10 @@
     public abstract void setPort( int port );
 
 
-    public abstract int getEncryptionMethod();
+    public abstract EncryptionMethod getEncryptionMethod();
 
 
-    public abstract void setEncryptionMethod( int encryptionMethod );
+    public abstract void setEncryptionMethod( EncryptionMethod encryptionMethod );
 
 
     public abstract int getAliasesDereferencingMethod();
@@ -150,10 +147,10 @@
     public void setBindPassword( String bindPassword );
 
 
-    public int getAuthMethod();
+    public AuthenticationMethod getAuthMethod();
 
 
-    public void setAuthMethod( int authMethod );
+    public void setAuthMethod( AuthenticationMethod authMethod );
 
 
     public abstract IRootDSE getRootDSE();
@@ -165,12 +162,6 @@
     public abstract void setSchema( Schema schema );
 
 
-    public abstract ConnectionParameter getConnectionParameter();
-
-
-    public abstract void setConnectionParameter( ConnectionParameter connectionParameter );
-
-
     public abstract SearchManager getSearchManager();
 
 
@@ -180,26 +171,7 @@
     public abstract ModificationLogger getModificationLogger();
 
 
-    public abstract void reloadSchema( ExtendedProgressMonitor monitor );
-
-
-    /**
-     * Connects to the LDAP server without any authentification:
-     * 
-     * @param pm
-     *                The progress monitor
-     */
-    public abstract void connect( ExtendedProgressMonitor monitor );
-
-
-    /**
-     * Binds to the LDAP server using the required authentification. Depends
-     * on connect().
-     * 
-     * @param pm
-     *                The progress monitor
-     */
-    public abstract void bind( ExtendedProgressMonitor monitor );
+    public abstract void reloadSchema( StudioProgressMonitor monitor );
 
 
     /**
@@ -209,102 +181,55 @@
      * @param pm
      *                The progress monitor
      */
-    public abstract void fetchRootDSE( ExtendedProgressMonitor monitor );
-
-
-    /**
-     * Opens the connection to the LDAP server and loads the schema if
-     * required. Depends on fetchRootDSE().
-     * 
-     * @param pm
-     *                The progress monitor
-     */
-    public abstract void open( ExtendedProgressMonitor monitor );
-
-
-    public abstract boolean isOpened();
-
-
-    public abstract boolean canOpen();
-
+    public abstract void fetchRootDSE( StudioProgressMonitor monitor );
 
-    public abstract boolean canClose();
 
+    public abstract boolean existsEntry( DN dn, StudioProgressMonitor monitor );
 
-    public abstract void close();
 
-
-    public abstract boolean existsEntry( DN dn, ExtendedProgressMonitor monitor );
-
-
-    public abstract IEntry getEntry( DN dn, ExtendedProgressMonitor monitor );
+    public abstract IEntry getEntry( DN dn, StudioProgressMonitor monitor );
 
 
     public abstract IEntry getEntryFromCache( DN dn );
 
 
-    public abstract void search( ISearch searchRequest, ExtendedProgressMonitor monitor );
-
+    public abstract void search( ISearch searchRequest, StudioProgressMonitor monitor );
 
-    public abstract void delete( IEntry entryToDelete, ExtendedProgressMonitor monitor );
 
+    public abstract void delete( IEntry entryToDelete, StudioProgressMonitor monitor );
 
-    public abstract void delete( IValue valuesToDelete[], ExtendedProgressMonitor monitor );
 
+    public abstract void delete( IValue valuesToDelete[], StudioProgressMonitor monitor );
 
-    public abstract void delete( IAttribute attriubtesToDelete[], ExtendedProgressMonitor monitor );
 
+    public abstract void delete( IAttribute attriubtesToDelete[], StudioProgressMonitor monitor );
 
-    public abstract void create( IEntry entryToCreate, ExtendedProgressMonitor monitor );
 
+    public abstract void create( IEntry entryToCreate, StudioProgressMonitor monitor );
 
-    public abstract void create( IValue valuesToCreate[], ExtendedProgressMonitor monitor );
 
+    public abstract void create( IValue valuesToCreate[], StudioProgressMonitor monitor );
 
-    public abstract void modify( IValue oldValue, IValue newVaue, ExtendedProgressMonitor monitor );
 
+    public abstract void modify( IValue oldValue, IValue newVaue, StudioProgressMonitor monitor );
 
-    public abstract void rename( IEntry entryToRename, DN newDn, boolean deleteOldRdn, ExtendedProgressMonitor monitor );
 
+    public abstract void rename( IEntry entryToRename, DN newDn, boolean deleteOldRdn, StudioProgressMonitor monitor );
 
-    public abstract void move( IEntry entryToMove, DN newSuperior, ExtendedProgressMonitor monitor );
 
-
-    public abstract Object clone();
+    public abstract void move( IEntry entryToMove, DN newSuperior, StudioProgressMonitor monitor );
 
 
     public abstract void importLdif( LdifEnumeration enumeration, Writer logWriter, boolean continueOnError,
-        ExtendedProgressMonitor monitor );
+        StudioProgressMonitor monitor );
 
 
-    public abstract LdifEnumeration exportLdif( SearchParameter searchParameter, ExtendedProgressMonitor pm )
+    public abstract LdifEnumeration exportLdif( SearchParameter searchParameter, StudioProgressMonitor pm )
         throws ConnectionException;
 
 
-    /**
-     * Suspends the commitment of modifications.
-     * 
-     */
-    public abstract void suspend();
-
-
-    /**
-     * Resume the commitment of modifications.
-     * 
-     */
-    public abstract void resume( ExtendedProgressMonitor monitor );
-
-
-    /**
-     * Resets the state and deletes all uncommitted modifications
-     * 
-     */
-    public abstract void reset();
-
-
-    public abstract boolean isSuspended();
-
-
+    public abstract Connection getConnection();
+    
     public abstract int hashCode();
 
 

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IEntry.java Sun Aug 26 15:36:01 2007
@@ -23,8 +23,8 @@
 
 import java.io.Serializable;
 
+import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Subschema;
-import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -379,11 +379,11 @@
 
 
     /**
-     * Gets the connection of this entry.
+     * Gets the browser connection of this entry.
      * 
-     * @return the connection of this entry, never null.
+     * @return the browser connection of this entry, never null.
      */
-    public abstract IConnection getConnection();
+    public abstract IBrowserConnection getBrowserConnection();
 
 
     /**

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IReferralHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IReferralHandler.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IReferralHandler.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IReferralHandler.java Sun Aug 26 15:36:01 2007
@@ -40,6 +40,6 @@
      * @param referralURL the referral URL
      * @return the target connection
      */
-    public IConnection getReferralConnection( URL referralURL );
+    public IBrowserConnection getReferralConnection( URL referralURL );
 
 }

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearch.java Sun Aug 26 15:36:01 2007
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider;
+import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.SearchPropertyPageProvider;
 import org.eclipse.core.runtime.IAdaptable;
 
@@ -311,11 +311,11 @@
 
 
     /**
-     * Gets the connection.
+     * Gets the browser connection.
      * 
-     * @return the connection
+     * @return the browser connection
      */
-    public abstract IConnection getConnection();
+    public abstract IBrowserConnection getBrowserConnection();
 
 
     /**
@@ -325,7 +325,7 @@
      * 
      * @param connection the connection
      */
-    public abstract void setConnection( IConnection connection );
+    public abstract void setConnection( IBrowserConnection connection );
 
 
     /**

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ISearchResult.java Sun Aug 26 15:36:01 2007
@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider;
+import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
 import org.eclipse.core.runtime.IAdaptable;
 

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/IValue.java Sun Aug 26 15:36:01 2007
@@ -23,9 +23,9 @@
 
 import java.io.Serializable;
 
+import org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.AttributePropertyPageProvider;
-import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.EntryPropertyPageProvider;
 import org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ValuePropertyPageProvider;
 import org.eclipse.core.runtime.IAdaptable;

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/SearchParameter.java Sun Aug 26 15:36:01 2007
@@ -100,8 +100,8 @@
         scope = ISearch.SCOPE_ONELEVEL;
         timeLimit = 0;
         countLimit = 0;
-        aliasesDereferencingMethod = IConnection.DEREFERENCE_ALIASES_NEVER;
-        referralsHandlingMethod = IConnection.HANDLE_REFERRALS_IGNORE;
+        aliasesDereferencingMethod = IBrowserConnection.DEREFERENCE_ALIASES_NEVER;
+        referralsHandlingMethod = IBrowserConnection.HANDLE_REFERRALS_IGNORE;
         controls = null;
         initHasChildrenFlag = false;
         initAliasAndReferralFlag = false;

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/URL.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/URL.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/URL.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/URL.java Sun Aug 26 15:36:01 2007
@@ -24,6 +24,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
+import org.apache.directory.studio.connection.core.ConnectionParameter.EncryptionMethod;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
 
@@ -105,7 +106,7 @@
      * @param connection the connection
      * @param dn the DN
      */
-    public URL( IConnection connection, DN dn )
+    public URL( IBrowserConnection connection, DN dn )
     {
         this( connection );
 
@@ -124,14 +125,14 @@
      *
      * @param connection the connection
      */
-    public URL( IConnection connection )
+    public URL( IBrowserConnection connection )
     {
         if ( connection == null )
         {
             throw new IllegalArgumentException( BrowserCoreMessages.model__empty_url );
         }
 
-        if ( connection.getEncryptionMethod() == IConnection.ENCYRPTION_LDAPS )
+        if ( connection.getEncryptionMethod() == EncryptionMethod.LDAPS )
         {
             this.protocol = "ldaps";; //$NON-NLS-1$
         }
@@ -152,7 +153,7 @@
      */
     public URL( ISearch search )
     {
-        this( search.getConnection(), search.getSearchBase() );
+        this( search.getBrowserConnection(), search.getSearchBase() );
 
         if ( search == null )
         {

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/LdifEnumeration.java Sun Aug 26 15:36:01 2007
@@ -21,8 +21,8 @@
 package org.apache.directory.studio.ldapbrowser.core.model.ldif;
 
 
+import org.apache.directory.studio.connection.core.StudioProgressMonitor;
 import org.apache.directory.studio.ldapbrowser.core.internal.model.ConnectionException;
-import org.apache.directory.studio.ldapbrowser.core.jobs.ExtendedProgressMonitor;
 import org.apache.directory.studio.ldapbrowser.core.model.ldif.container.LdifContainer;
 
 
@@ -37,7 +37,7 @@
      *                instead.
      * @throws ConnectionException
      */
-    public boolean hasNext( ExtendedProgressMonitor monitor ) throws ConnectionException;
+    public boolean hasNext( StudioProgressMonitor monitor ) throws ConnectionException;
 
 
     /**
@@ -49,6 +49,6 @@
      * @return the next LDIF container or null if hasNext() returns false;
      * @throws ConnectionException
      */
-    public LdifContainer next( ExtendedProgressMonitor monitor ) throws ConnectionException;
+    public LdifContainer next( StudioProgressMonitor monitor ) throws ConnectionException;
 
 }

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/parser/LdifParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/parser/LdifParser.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/parser/LdifParser.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/ldif/parser/LdifParser.java Sun Aug 26 15:36:01 2007
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.directory.studio.connection.core.StudioProgressMonitor;
 import org.apache.directory.studio.ldapbrowser.core.internal.model.ConnectionException;
 import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEOFPart;
 import org.apache.directory.studio.ldapbrowser.core.model.ldif.LdifEnumeration;
@@ -113,7 +114,7 @@
             private boolean footerParsed = false;
 
 
-            public boolean hasNext( org.apache.directory.studio.ldapbrowser.core.jobs.ExtendedProgressMonitor monitor )
+            public boolean hasNext( StudioProgressMonitor monitor )
             {
                 if ( containerList.isEmpty() )
                 {
@@ -167,7 +168,7 @@
             }
 
 
-            public LdifContainer next( org.apache.directory.studio.ldapbrowser.core.jobs.ExtendedProgressMonitor monitor )
+            public LdifContainer next( StudioProgressMonitor monitor )
             {
                 if ( hasNext( monitor ) )
                 {

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Subschema.java Sun Aug 26 15:36:01 2007
@@ -27,7 +27,7 @@
 import java.util.TreeSet;
 
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 
 
@@ -58,11 +58,11 @@
         {
             this.objectClassNames = new String[0];
         }
-        this.schema = entry.getConnection().getSchema();
+        this.schema = entry.getBrowserConnection().getSchema();
     }
 
 
-    public Subschema( String[] objectClassNames, IConnection connection )
+    public Subschema( String[] objectClassNames, IBrowserConnection connection )
     {
         this.objectClassNames = objectClassNames;
         this.schema = connection.getSchema();

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaLexer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaLexer.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaLexer.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaLexer.java Sun Aug 26 15:36:01 2007
@@ -22,35 +22,24 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.io.*;
-import java.util.*;
-
 import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
 import java.io.Reader;
 import java.util.Hashtable;
 
-import org.apache.directory.studio.ldapbrowser.core.model.schema.*;
-
-import antlr.CharScanner;
-import antlr.InputBuffer;
 import antlr.ByteBuffer;
 import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
 import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
 import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
 import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
 
 
 public class SchemaLexer extends antlr.CharScanner implements SchemaTokenTypes, TokenStream

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaParser.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaParser.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaParser.java Sun Aug 26 15:36:01 2007
@@ -22,24 +22,21 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.io.*;
-import java.util.*;
+import java.io.StringReader;
 
-import org.apache.directory.studio.ldapbrowser.core.model.schema.*;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.AttributeTypeDescription;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.LdapSyntaxDescription;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.MatchingRuleDescription;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.MatchingRuleUseDescription;
+import org.apache.directory.studio.ldapbrowser.core.model.schema.ObjectClassDescription;
 
-import antlr.TokenBuffer;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.ANTLRException;
-import antlr.LLkParser;
-import antlr.Token;
-import antlr.TokenStream;
-import antlr.RecognitionException;
 import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
 import antlr.ParserSharedInputState;
-import antlr.collections.impl.BitSet;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
 
 
 public class SchemaParser extends antlr.LLkParser implements SchemaTokenTypes

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaTokenTypes.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaTokenTypes.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaTokenTypes.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaTokenTypes.java Sun Aug 26 15:36:01 2007
@@ -22,10 +22,6 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.io.*;
-import java.util.*;
-
-import org.apache.directory.studio.ldapbrowser.core.model.schema.*;
 
 
 public interface SchemaTokenTypes

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueLexer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueLexer.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueLexer.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueLexer.java Sun Aug 26 15:36:01 2007
@@ -22,31 +22,24 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.util.*;
-
 import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
 import java.io.Reader;
 import java.util.Hashtable;
-import antlr.CharScanner;
-import antlr.InputBuffer;
+
 import antlr.ByteBuffer;
 import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
 import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
 import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
 import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
 
 
 public class SchemaValueLexer extends antlr.CharScanner implements SchemaValueTokenTypes, TokenStream

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueParser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueParser.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueParser.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueParser.java Sun Aug 26 15:36:01 2007
@@ -22,21 +22,16 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import antlr.TokenBuffer;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.ANTLRException;
-import antlr.LLkParser;
-import antlr.Token;
-import antlr.TokenStream;
-import antlr.RecognitionException;
 import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
 import antlr.ParserSharedInputState;
-import antlr.collections.impl.BitSet;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
 
 
 public class SchemaValueParser extends antlr.LLkParser implements SchemaValueTokenTypes

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueTokenTypes.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueTokenTypes.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueTokenTypes.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/parser/SchemaValueTokenTypes.java Sun Aug 26 15:36:01 2007
@@ -22,7 +22,6 @@
 package org.apache.directory.studio.ldapbrowser.core.model.schema.parser;
 
 
-import java.util.*;
 
 
 public interface SchemaValueTokenTypes

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/ModelConverter.java Sun Aug 26 15:36:01 2007
@@ -30,7 +30,7 @@
 import org.apache.directory.studio.ldapbrowser.core.internal.model.Value;
 import org.apache.directory.studio.ldapbrowser.core.model.DN;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
 import org.apache.directory.studio.ldapbrowser.core.model.ModelModificationException;
@@ -63,7 +63,7 @@
      * @throws ModelModificationException the model modification exception
      * @throws NameException the name exception
      */
-    public static DummyEntry ldifContentRecordToEntry( LdifContentRecord ldifContentRecord, IConnection connection )
+    public static DummyEntry ldifContentRecordToEntry( LdifContentRecord ldifContentRecord, IBrowserConnection connection )
         throws NameException, ModelModificationException
     {
         return createIntern( ldifContentRecord, connection );
@@ -81,7 +81,7 @@
      * @throws ModelModificationException the model modification exception
      * @throws NameException the name exception
      */
-    public static DummyEntry ldifChangeAddRecordToEntry( LdifChangeAddRecord ldifChangeAddRecord, IConnection connection )
+    public static DummyEntry ldifChangeAddRecordToEntry( LdifChangeAddRecord ldifChangeAddRecord, IBrowserConnection connection )
         throws NameException, ModelModificationException
     {
         return createIntern( ldifChangeAddRecord, connection );
@@ -99,7 +99,7 @@
      * @throws ModelModificationException the model modification exception
      * @throws NameException the name exception
      */
-    private static DummyEntry createIntern( LdifRecord ldifRecord, IConnection connection ) throws NameException,
+    private static DummyEntry createIntern( LdifRecord ldifRecord, IBrowserConnection connection ) throws NameException,
         ModelModificationException
     {
         LdifPart[] parts = ldifRecord.getParts();
@@ -293,7 +293,7 @@
     {
         if ( entry.isReferral() )
         {
-            cr.addControl( LdifControlLine.create( IConnection.CONTROL_MANAGEDSAIT, null, ( String ) null ) );
+            cr.addControl( LdifControlLine.create( IBrowserConnection.CONTROL_MANAGEDSAIT, null, ( String ) null ) );
         }
     }
 

Modified: directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/utils/Utils.java Sun Aug 26 15:36:01 2007
@@ -140,6 +140,7 @@
 
     public static String serialize( Object o )
     {
+        Thread.currentThread().setContextClassLoader( Utils.class.getClassLoader() );
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         XMLEncoder encoder = new XMLEncoder( baos );
         encoder.writeObject( o );
@@ -151,6 +152,7 @@
 
     public static Object deserialize( String s )
     {
+        Thread.currentThread().setContextClassLoader( Utils.class.getClassLoader() );
         ByteArrayInputStream bais = new ByteArrayInputStream( LdifUtils.utf8encode( s ) );
         XMLDecoder decoder = new XMLDecoder( bais );
         Object o = decoder.readObject();

Modified: directory/studio/trunk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF Sun Aug 26 15:36:01 2007
@@ -15,6 +15,8 @@
  org.eclipse.ui.views,
  org.eclipse.ui.forms,
  org.eclipse.jface.text,
+ org.apache.directory.studio.connection.core,
+ org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldifeditor

Modified: directory/studio/trunk/studio-ldapbrowser-ui/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/plugin.xml?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/plugin.xml (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/plugin.xml Sun Aug 26 15:36:01 2007
@@ -235,22 +235,17 @@
 	<extension
 		point="org.eclipse.ui.propertyPages">
 		<page
-        class="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ConnectionPropertyPage"
-        id="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ConnectionPropertyPage"
-        name="Connection"
-        objectClass="org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider"/>            
-		<page
-        category="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ConnectionPropertyPage"
+        category="org.apache.directory.studio.connection.ui.properties.ConnectionPropertyPage"
         class="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SchemaPropertyPage"
         id="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SchemaPropertyPage"
         name="Schema"
-        objectClass="org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider"/>            
+        objectClass="org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider"/>            
 		<page
-        category="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.ConnectionPropertyPage"
+        category="org.apache.directory.studio.connection.ui.properties.ConnectionPropertyPage"
         class="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.RootDSEPropertyPage"
         id="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.RootDSEPropertyPage"
         name="Root DSE"
-        objectClass="org.apache.directory.studio.ldapbrowser.core.propertypageproviders.ConnectionPropertyPageProvider"/>                        
+        objectClass="org.apache.directory.studio.connection.core.ConnectionPropertyPageProvider"/>                        
 		<page
         class="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SearchPropertyPage"
         id="org.apache.directory.studio.ldapbrowser.ui.dialogs.properties.SearchPropertyPage"
@@ -315,9 +310,9 @@
              style="push">
        </action>
        <action
-             class="org.apache.directory.studio.ldapbrowser.common.actions.NewConnectionAction"
+             class="org.apache.directory.studio.connection.ui.actions.NewConnectionAction"
              icon="resources/icons/connection_add.gif"
-             id="org.apache.directory.studio.ldapbrowser.ui.actions.NewConnectionAction"
+             id="org.apache.directory.studio.connection.ui.actions.NewConnectionAction"
              label="New Connection..."
              menubarPath="org.apache.directory.studio.ldapbrowser.ldapMenu/newConnection"
              style="push"/>

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsAction.java Sun Aug 26 15:36:01 2007
@@ -162,11 +162,11 @@
         }
         for ( int i = 0; i < getSelectedBookmarks().length; i++ )
         {
-            IEntry entry = getSelectedBookmarks()[0].getConnection().getEntryFromCache(
+            IEntry entry = getSelectedBookmarks()[0].getBrowserConnection().getEntryFromCache(
                 getSelectedBookmarks()[0].getDn() );
             if ( entry == null )
             {
-                ReadEntryJob job = new ReadEntryJob( getSelectedBookmarks()[0].getConnection(),
+                ReadEntryJob job = new ReadEntryJob( getSelectedBookmarks()[0].getBrowserConnection(),
                     getSelectedBookmarks()[0].getDn() );
                 RunnableContextJobAdapter.execute( job );
                 entry = job.getReadEntry();

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/CopyEntryAsCsvAction.java Sun Aug 26 15:36:01 2007
@@ -224,7 +224,7 @@
 
             if ( attributes.length > 0 )
             {
-                AttributeComparator comparator = new AttributeComparator( entries[0].getConnection() );
+                AttributeComparator comparator = new AttributeComparator( entries[0].getBrowserConnection() );
                 Arrays.sort( attributes, comparator );
             }
 

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/ImportExportAction.java Sun Aug 26 15:36:01 2007
@@ -21,8 +21,10 @@
 package org.apache.directory.studio.ldapbrowser.ui.actions;
 
 
+import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
 import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
@@ -195,11 +197,11 @@
         {
             if ( getEntry() != null )
             {
-                wizard = new ImportLdifWizard( getEntry().getConnection() );
+                wizard = new ImportLdifWizard( getEntry().getBrowserConnection() );
             }
             else if ( getSearch() != null )
             {
-                wizard = new ImportLdifWizard( getSearch().getConnection() );
+                wizard = new ImportLdifWizard( getSearch().getBrowserConnection() );
             }
             else if ( getConnectionInput() != null )
             {
@@ -214,11 +216,11 @@
         {
             if ( getEntry() != null )
             {
-                wizard = new ImportDsmlWizard( getEntry().getConnection() );
+                wizard = new ImportDsmlWizard( getEntry().getBrowserConnection() );
             }
             else if ( getSearch() != null )
             {
-                wizard = new ImportDsmlWizard( getSearch().getConnection() );
+                wizard = new ImportDsmlWizard( getSearch().getBrowserConnection() );
             }
             else if ( getConnectionInput() != null )
             {
@@ -279,7 +281,7 @@
             entry = getSelectedBookmarks()[0].getEntry();
         }
 
-        return entry != null && entry.getConnection().isOpened() ? entry : null;
+        return entry != null ? entry : null;
     }
 
 
@@ -289,10 +291,20 @@
      * @return
      *      the Connection
      */
-    protected IConnection getConnection()
+    protected IBrowserConnection getConnection()
     {
-        return getSelectedConnections().length > 0 && getSelectedConnections()[0].isOpened() ? getSelectedConnections()[0]
-            : null;
+        if ( getSelectedConnections().length > 0
+            && getSelectedConnections()[0].getJNDIConnectionWrapper().isConnected() )
+        {
+            Connection connection = getSelectedConnections()[0];
+            IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnection(
+                connection );
+            return browserConnection;
+        }
+        else
+        {
+            return null;
+        }
     }
 
 
@@ -304,8 +316,7 @@
      */
     protected ISearch getSearch()
     {
-        return getSelectedSearches().length > 0 && getSelectedSearches()[0].getConnection().isOpened() ? getSelectedSearches()[0]
-            : null;
+        return getSelectedSearches().length > 0 ? getSelectedSearches()[0] : null;
     }
 
 
@@ -315,12 +326,12 @@
      * @return
      *      the Connection Input
      */
-    protected IConnection getConnectionInput()
+    protected IBrowserConnection getConnectionInput()
     {
 
-        if ( getInput() != null && ( getInput() instanceof IConnection ) && ( ( IConnection ) getInput() ).isOpened() )
+        if ( getInput() != null && ( getInput() instanceof IBrowserConnection ) )
         {
-            return ( IConnection ) getInput();
+            return ( IBrowserConnection ) getInput();
         }
         else
         {

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateDnInDitAction.java Sun Aug 26 15:36:01 2007
@@ -85,7 +85,7 @@
                 IValue value = getSelectedAttributeHierarchies()[0].getAttribute().getValues()[0];
                 if ( value.isString() && new DN( value.getStringValue() ) != null )
                 {
-                    return new ConnectionAndDn( value.getAttribute().getEntry().getConnection(), new DN( value
+                    return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN( value
                         .getStringValue() ) );
                 }
             }
@@ -102,7 +102,7 @@
                 IValue value = getSelectedValues()[0];
                 if ( value.isString() && new DN( value.getStringValue() ) != null )
                 {
-                    return new ConnectionAndDn( value.getAttribute().getEntry().getConnection(), new DN( value
+                    return new ConnectionAndDn( value.getAttribute().getEntry().getBrowserConnection(), new DN( value
                         .getStringValue() ) );
                 }
             }
@@ -115,7 +115,7 @@
         if ( getSelectedSearchResults().length == 1 && getSelectedAttributeHierarchies().length == 0 )
         {
             ISearchResult result = getSelectedSearchResults()[0];
-            return new ConnectionAndDn( result.getEntry().getConnection(), result.getEntry().getDn() );
+            return new ConnectionAndDn( result.getEntry().getBrowserConnection(), result.getEntry().getDn() );
         }
 
         return null;

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateEntryInDitAction.java Sun Aug 26 15:36:01 2007
@@ -99,14 +99,14 @@
         if ( getSelectedSearchResults().length == 1
             && getSelectedBookmarks().length + getSelectedEntries().length + getSelectedBrowserViewCategories().length == 0 )
         {
-            return new ConnectionAndDn( getSelectedSearchResults()[0].getEntry().getConnection(),
+            return new ConnectionAndDn( getSelectedSearchResults()[0].getEntry().getBrowserConnection(),
                 getSelectedSearchResults()[0].getEntry().getDn() );
         }
         else if ( getSelectedBookmarks().length == 1
             && getSelectedSearchResults().length + getSelectedEntries().length
                 + getSelectedBrowserViewCategories().length == 0 )
         {
-            return new ConnectionAndDn( getSelectedBookmarks()[0].getConnection(), getSelectedBookmarks()[0].getDn() );
+            return new ConnectionAndDn( getSelectedBookmarks()[0].getBrowserConnection(), getSelectedBookmarks()[0].getDn() );
         }
         else
         {

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/LocateInDitAction.java Sun Aug 26 15:36:01 2007
@@ -25,7 +25,7 @@
 import org.apache.directory.studio.ldapbrowser.common.jobs.RunnableContextJobAdapter;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ReadEntryJob;
 import org.apache.directory.studio.ldapbrowser.core.model.DN;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.ui.views.browser.BrowserView;
 
@@ -51,7 +51,7 @@
         ConnectionAndDn connectionAndDn = getConnectionAndDn();
         if ( connectionAndDn != null )
         {
-            IConnection connection = connectionAndDn.connection;
+            IBrowserConnection connection = connectionAndDn.connection;
             DN dn = connectionAndDn.dn;
 
             IEntry entry = connection.getEntryFromCache( dn );
@@ -123,7 +123,7 @@
     protected class ConnectionAndDn
     {
         /** The connection */
-        private IConnection connection;
+        private IBrowserConnection connection;
 
         /** The DN */
         private DN dn;
@@ -135,7 +135,7 @@
          * @param connection the connection
          * @param dn the DN
          */
-        protected ConnectionAndDn( IConnection connection, DN dn )
+        protected ConnectionAndDn( IBrowserConnection connection, DN dn )
         {
             this.connection = connection;
             this.dn = dn;

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/MoveAction.java Sun Aug 26 15:36:01 2007
@@ -156,7 +156,7 @@
      */
     protected IEntry[] getEntries()
     {
-        if ( getSelectedConnections().length + getSelectedBookmarks().length + getSelectedSearches().length
+        if ( getSelectedBookmarks().length + getSelectedSearches().length
             + getSelectedAttributes().length + getSelectedValues().length == 0
             && getSelectedEntries().length + getSelectedSearchResults().length > 0 )
         {
@@ -200,7 +200,7 @@
             DN newParentDn = moveDialog.getParentDn();
             if ( newParentDn != null /* && !newRdn.equals(entry.getRdn()) */)
             {
-                IEntry newParentEntry = entries[0].getConnection().getEntryFromCache( newParentDn );
+                IEntry newParentEntry = entries[0].getBrowserConnection().getEntryFromCache( newParentDn );
                 if ( newParentEntry != null )
                 {
                     new MoveEntriesJob( entries, newParentEntry ).execute();

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=569899&r1=569898&r2=569899&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 Sun Aug 26 15:36:01 2007
@@ -21,8 +21,10 @@
 package org.apache.directory.studio.ldapbrowser.ui.actions;
 
 
+import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.AttributeTypeDescription;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.LdapSyntaxDescription;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.MatchingRuleDescription;
@@ -305,10 +307,10 @@
         {
             String ocdName = getSelectedValues()[0].getStringValue();
             if ( ocdName != null
-                && getSelectedValues()[0].getAttribute().getEntry().getConnection().getSchema()
+                && getSelectedValues()[0].getAttribute().getEntry().getBrowserConnection().getSchema()
                     .hasObjectClassDescription( ocdName ) )
             {
-                return getSelectedValues()[0].getAttribute().getEntry().getConnection().getSchema()
+                return getSelectedValues()[0].getAttribute().getEntry().getBrowserConnection().getSchema()
                     .getObjectClassDescription( ocdName );
             }
         }
@@ -353,45 +355,48 @@
      *
      * @return the connection
      */
-    private IConnection getConnection()
+    private IBrowserConnection getConnection()
     {
         if ( ( getSelectedValues().length + getSelectedAttributes().length ) + getSelectedAttributeHierarchies().length == 1 )
         {
-            IConnection connection = null;
+            IBrowserConnection connection = null;
             if ( getSelectedValues().length == 1 )
             {
-                connection = getSelectedValues()[0].getAttribute().getEntry().getConnection();
+                connection = getSelectedValues()[0].getAttribute().getEntry().getBrowserConnection();
             }
             else if ( getSelectedAttributes().length == 1 )
             {
-                connection = getSelectedAttributes()[0].getEntry().getConnection();
+                connection = getSelectedAttributes()[0].getEntry().getBrowserConnection();
             }
             else if ( getSelectedAttributeHierarchies().length == 1 && getSelectedAttributeHierarchies()[0].size() == 1 )
             {
-                connection = getSelectedAttributeHierarchies()[0].getAttribute().getEntry().getConnection();
+                connection = getSelectedAttributeHierarchies()[0].getAttribute().getEntry().getBrowserConnection();
             }
 
             return connection;
         }
         else if ( getSelectedConnections().length == 1 )
         {
-            return getSelectedConnections()[0];
+            Connection connection = getSelectedConnections()[0];
+            IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnection(
+                connection );
+            return browserConnection;
         }
         else if ( getSelectedEntries().length == 1 )
         {
-            return getSelectedEntries()[0].getConnection();
+            return getSelectedEntries()[0].getBrowserConnection();
         }
         else if ( getSelectedSearchResults().length == 1 )
         {
-            return getSelectedSearchResults()[0].getEntry().getConnection();
+            return getSelectedSearchResults()[0].getEntry().getBrowserConnection();
         }
         else if ( getSelectedBookmarks().length == 1 )
         {
-            return getSelectedBookmarks()[0].getConnection();
+            return getSelectedBookmarks()[0].getBrowserConnection();
         }
         else if ( getSelectedSearches().length == 1 )
         {
-            return getSelectedSearches()[0].getConnection();
+            return getSelectedSearches()[0].getBrowserConnection();
         }
 
         return null;

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/AttributePropertyPage.java Sun Aug 26 15:36:01 2007
@@ -207,10 +207,10 @@
             attributeValuesText.setText( "" + valCount );
             attributeSizeText.setText( Utils.formatBytes( bytes ) );
 
-            if ( attribute.getEntry().getConnection().getSchema().hasAttributeTypeDescription(
+            if ( attribute.getEntry().getBrowserConnection().getSchema().hasAttributeTypeDescription(
                 attribute.getDescription() ) )
             {
-                AttributeTypeDescription atd = attribute.getEntry().getConnection().getSchema()
+                AttributeTypeDescription atd = attribute.getEntry().getBrowserConnection().getSchema()
                     .getAttributeTypeDescription( attribute.getDescription() );
 
                 atdOidText.setText( atd.getNumericOID() );

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/BookmarkPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/BookmarkPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/BookmarkPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/BookmarkPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -93,7 +93,7 @@
         this.bookmarkEntryWidget.createWidget( innerComposite );
         if ( this.bookmark != null )
         {
-            this.bookmarkEntryWidget.setInput( this.bookmark.getConnection(), this.bookmark.getDn() );
+            this.bookmarkEntryWidget.setInput( this.bookmark.getBrowserConnection(), this.bookmark.getDn() );
         }
         this.bookmarkEntryWidget.addWidgetModifyListener( new WidgetModifyListener()
         {
@@ -138,7 +138,7 @@
                 setErrorMessage( "Please enter a name." );
             }
             else if ( !bookmark.getName().equals( this.bookmarkNameText.getText() )
-                && bookmark.getConnection().getBookmarkManager().getBookmark( this.bookmarkNameText.getText() ) != null )
+                && bookmark.getBrowserConnection().getBookmarkManager().getBookmark( this.bookmarkNameText.getText() ) != null )
             {
                 setValid( false );
                 setErrorMessage( "A bookmark with this name already exists." );

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/RootDSEPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -31,10 +31,11 @@
 import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetTableMetadata;
 import org.apache.directory.studio.ldapbrowser.core.internal.model.RootDSE;
 import org.apache.directory.studio.ldapbrowser.core.model.IAttribute;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
 import org.apache.directory.studio.ldapbrowser.core.model.IValue;
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -98,11 +99,22 @@
         super.noDefaultAndApplyButton();
     }
 
+    
+    static IBrowserConnection getConnection( Object element )
+    {
+        IBrowserConnection connection = null;
+        if ( element instanceof IAdaptable )
+        {
+            connection = ( IBrowserConnection ) ( ( IAdaptable ) element ).getAdapter( IBrowserConnection.class );
+        }
+        return connection;
+    }
+
 
     protected Control createContents( Composite parent )
     {
 
-        final IConnection connection = ConnectionPropertyPage.getConnection( getElement() );
+        final IBrowserConnection connection = getConnection( getElement() );
 
         this.tabFolder = new TabFolder( parent, SWT.TOP );
         RowLayout mainLayout = new RowLayout();
@@ -458,7 +470,7 @@
     }
 
 
-    private void addInfo( final IConnection connection, Composite composite, String attributeName, String labelName )
+    private void addInfo( final IBrowserConnection connection, Composite composite, String attributeName, String labelName )
     {
         Label label = new Label( composite, SWT.NONE );
         label.setText( labelName );

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaAttributesPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaAttributesPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaAttributesPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaAttributesPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.dialogs.properties;
 
 
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -71,9 +71,9 @@
         viewer.setContentProvider( new ArrayContentProvider() );
         viewer.setLabelProvider( new LabelProvider() );
 
-        if ( getElement() instanceof IConnection )
+        if ( getElement() instanceof IBrowserConnection )
         {
-            IConnection connection = ( IConnection ) getElement();
+            IBrowserConnection connection = ( IBrowserConnection ) getElement();
             if ( connection != null )
             {
                 Object[] atds = connection.getSchema().getAttributeTypeDescriptions();

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaObjectClassesPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaObjectClassesPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaObjectClassesPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaObjectClassesPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.dialogs.properties;
 
 
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
@@ -71,9 +71,9 @@
         viewer.setContentProvider( new ArrayContentProvider() );
         viewer.setLabelProvider( new LabelProvider() );
 
-        if ( getElement() instanceof IConnection )
+        if ( getElement() instanceof IBrowserConnection )
         {
-            IConnection connection = ( IConnection ) getElement();
+            IBrowserConnection connection = ( IBrowserConnection ) getElement();
             if ( connection != null )
             {
                 Object[] ocds = connection.getSchema().getObjectClassDescriptions();

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SchemaPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -27,12 +27,11 @@
 
 import org.apache.directory.studio.ldapbrowser.common.jobs.RunnableContextJobAdapter;
 import org.apache.directory.studio.ldapbrowser.common.widgets.BaseWidgetUtils;
-import org.apache.directory.studio.ldapbrowser.core.ConnectionManager;
+import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
 import org.apache.directory.studio.ldapbrowser.core.jobs.ReloadSchemasJob;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.utils.Utils;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.events.SelectionListener;
@@ -123,7 +122,7 @@
         BaseWidgetUtils.createLabel( cacheComposite, "Cache Size:", 1 );
         cacheSizeText = BaseWidgetUtils.createWrappedLabeledText( cacheComposite, "", 1 );
 
-        IConnection connection = ConnectionPropertyPage.getConnection( getElement() );
+        IBrowserConnection connection = RootDSEPropertyPage.getConnection( getElement() );
         this.connectionUpdated( connection );
 
         return composite;
@@ -132,15 +131,15 @@
 
     private void reloadSchema()
     {
-        final IConnection connection = ConnectionPropertyPage.getConnection( getElement() );
-        ReloadSchemasJob job = new ReloadSchemasJob( new IConnection[]
+        final IBrowserConnection connection = RootDSEPropertyPage.getConnection( getElement() );
+        ReloadSchemasJob job = new ReloadSchemasJob( new IBrowserConnection[]
             { connection } );
         RunnableContextJobAdapter.execute( job );
         this.connectionUpdated( connection );
     }
 
 
-    private void connectionUpdated( IConnection connection )
+    private void connectionUpdated( IBrowserConnection connection )
     {
 
         if ( !this.dnText.isDisposed() )
@@ -189,7 +188,7 @@
 
             if ( connection != null )
             {
-                String cacheFileName = ConnectionManager.getSchemaCacheFileName( connection.getName() );
+                String cacheFileName = BrowserConnectionManager.getSchemaCacheFileName( connection.getName() );
                 File cacheFile = new File( cacheFileName );
                 if ( cacheFile.exists() )
                 {
@@ -206,14 +205,7 @@
                 }
             }
 
-            if ( connection != null && connection.isOpened() )
-            {
-                reloadSchemaButton.setEnabled( true );
-            }
-            else
-            {
-                reloadSchemaButton.setEnabled( true );
-            }
+            reloadSchemaButton.setEnabled( true );
         }
     }
 

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/dialogs/properties/SearchPropertyPage.java Sun Aug 26 15:36:01 2007
@@ -110,7 +110,7 @@
     public boolean performOk()
     {
         boolean modified = spw.saveToSearch( search );
-        if ( modified && search.getConnection() != null && search.getConnection().isOpened() )
+        if ( modified && search.getBrowserConnection() != null )
         {
             // send update event to force saving of new search parameters.
             EventRegistry.fireSearchUpdated( new SearchUpdateEvent( search,

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorNavigationLocation.java Sun Aug 26 15:36:01 2007
@@ -24,7 +24,7 @@
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.model.DN;
 import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
-import org.apache.directory.studio.ldapbrowser.core.model.IConnection;
+import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
 import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
 import org.apache.directory.studio.ldapbrowser.core.model.IRootDSE;
 import org.apache.directory.studio.ldapbrowser.core.model.ISearch;
@@ -115,7 +115,7 @@
                 IEntry entry = eei.getEntryInput();
                 memento.putString( "TYPE", "IEntry" );
                 memento.putString( "DN", entry.getDn().toString() );
-                memento.putString( "CONNECTION", entry.getConnection().getName() );
+                memento.putString( "CONNECTION", entry.getBrowserConnection().getName() );
             }
             else if ( eei.getSearchResultInput() != null )
             {
@@ -123,14 +123,14 @@
                 memento.putString( "TYPE", "ISearchResult" );
                 memento.putString( "DN", searchResult.getDn().toString() );
                 memento.putString( "SEARCH", searchResult.getSearch().getName() );
-                memento.putString( "CONNECTION", searchResult.getSearch().getConnection().getName() );
+                memento.putString( "CONNECTION", searchResult.getSearch().getBrowserConnection().getName() );
             }
             else if ( eei.getBookmarkInput() != null )
             {
                 IBookmark bookmark = eei.getBookmarkInput();
                 memento.putString( "TYPE", "IBookmark" );
                 memento.putString( "BOOKMARK", bookmark.getName() );
-                memento.putString( "CONNECTION", bookmark.getConnection().getName() );
+                memento.putString( "CONNECTION", bookmark.getBrowserConnection().getName() );
             }
         }
 
@@ -147,7 +147,7 @@
             String type = memento.getString( "TYPE" );
             if ( "IEntry".equals( type ) )
             {
-                IConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
+                IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
                     memento.getString( "CONNECTION" ) );
                 DN dn = new DN( memento.getString( "DN" ) );
                 IEntry entry = connection.getEntryFromCache( dn );
@@ -155,7 +155,7 @@
             }
             else if ( "ISearchResult".equals( type ) )
             {
-                IConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
+                IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
                     memento.getString( "CONNECTION" ) );
                 ISearch search = connection.getSearchManager().getSearch( memento.getString( "SEARCH" ) );
                 ISearchResult[] searchResults = search.getSearchResults();
@@ -171,7 +171,7 @@
             }
             else if ( "IBookmark".equals( type ) )
             {
-                IConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
+                IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getConnection(
                     memento.getString( "CONNECTION" ) );
                 IBookmark bookmark = connection.getBookmarkManager().getBookmark( memento.getString( "BOOKMARK" ) );
                 super.setInput( new EntryEditorInput( bookmark ) );

Modified: directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java?rev=569899&r1=569898&r2=569899&view=diff
==============================================================================
--- directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java (original)
+++ directory/studio/trunk/studio-ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/EntryEditorUniversalListener.java Sun Aug 26 15:36:01 2007
@@ -22,7 +22,7 @@
 
 
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
-import org.apache.directory.studio.ldapbrowser.common.actions.SelectionUtils;
+import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
 import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetUniversalListener;
 import org.apache.directory.studio.ldapbrowser.core.events.EntryModificationEvent;
 import org.apache.directory.studio.ldapbrowser.core.model.IBookmark;
@@ -69,10 +69,10 @@
             {
                 if ( entryEditor.getSite().getWorkbenchWindow() == part.getSite().getWorkbenchWindow() )
                 {
-                    IEntry[] entries = SelectionUtils.getEntries( selection );
-                    ISearchResult[] searchResults = SelectionUtils.getSearchResults( selection );
-                    IBookmark[] bookmarks = SelectionUtils.getBookmarks( selection );
-                    Object[] objects = SelectionUtils.getObjects( selection );
+                    IEntry[] entries = BrowserSelectionUtils.getEntries( selection );
+                    ISearchResult[] searchResults = BrowserSelectionUtils.getSearchResults( selection );
+                    IBookmark[] bookmarks = BrowserSelectionUtils.getBookmarks( selection );
+                    Object[] objects = BrowserSelectionUtils.getObjects( selection );
                     if ( entries.length + searchResults.length + bookmarks.length == 1 && objects.length == 1 )
                     {
                         if ( entries.length == 1 )



Mime
View raw message